 Evan Prodromou
		
	
	5d09b6b3f0
	
	
	Merge branch '0.8.x' into 0.9.x
			Evan Prodromou
		
	
	5d09b6b3f0
	
	
	Merge branch '0.8.x' into 0.9.x
		
			
			Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
		
	
 
		2009-08-27 11:16:45 -07:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2009-06-17 06:38:21 +00:00
		 
	
		
			
			
			
			
			
			2009-08-26 03:33:43 -04:00
		 
	
		
			
			
			
			
			
			2009-08-25 18:40:12 -04:00
		 
	
		
			
			
			
			
			
			2009-08-25 18:53:24 -04:00
		 
	
		
			
			
			
			
			
			2009-05-17 00:05:07 -04:00
		 
	
		
			
			
			
			
			
			2009-05-26 21:20:04 -04:00
		 
	
		
			
			
			
			
			
			2009-07-01 13:46:32 -04:00
		 
	
		
			
			
			
			
			
			2009-07-01 20:57:21 +00:00
		 
	
		
			
			
			
			
			
			2009-03-30 11:11:53 -04:00
		 
	
		
			
			
			
			
			
			2009-03-30 11:11:53 -04:00
		 
	
		
			
			
			
			
			
			2009-08-25 18:40:12 -04:00
		 
	
		
			
			
			
			
			
			2009-08-27 11:16:45 -07:00
		 
	
		
			
			
			
			
			
			2009-01-17 02:57:51 +00:00