| 
							
							
								 Brion Vibber | b1a68e15b7 | Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?) | 2010-06-10 15:37:06 -07:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | 6317f7d92b | Assigning my copyrights to the Free Software Foundation | 2010-05-27 18:27:33 -04:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | e9995b0f6a | Create IM plugin, Pluginize XMPP, Create AIM plugin | 2010-01-27 13:48:35 -05:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | 681065d734 | Made the IMAP plugin work in the style of the new queue/iomanagers | 2010-01-13 15:35:53 -05:00 |  |