| 
							
							
								 Siebrand Mazeland | 57c28ba4d0 | Update translator documentation and whitespace. Update file header comment. | 2011-04-13 13:22:50 +02:00 |  | 
			
				
					| 
							
							
								 Brion Vibber | aa02f6020e | Merge branch '0.9.x' into 1.0.x | 2010-10-08 11:47:50 -07:00 |  | 
			
				
					| 
							
							
								 Brion Vibber | e23ad7392f | Normalize execution guards in imap plugin files. | 2010-10-08 11:01:13 -07:00 |  | 
			
				
					| 
							
							
								 Brion Vibber | 59119482ca | Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php | 2010-10-04 12:54:36 -07:00 |  | 
			
				
					| 
							
							
								 Siebrand Mazeland | 500f8e5a87 | * i18n/L10n updates. * remove superfluous whitespace. | 2010-09-20 20:54:30 +02:00 |  | 
			
				
					| 
							
							
								 Siebrand Mazeland | 2d119df6d3 | * update i18n/L10n * remove superfluous whitespace | 2010-09-18 11:43:17 +02:00 |  | 
			
				
					| 
							
							
								 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 |  |