Merge branch 'apull'

author friendica <info@friendica.com>

Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)

committer friendica <info@friendica.com>

Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)
author friendica <info@friendica.com>
Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)
committer friendica <info@friendica.com>
Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)
diff --cc statusnet/statusnet.php

index 6580e897291bba6e4e6319c93e797613a8fd9dc9,7e9226a0e55bf512a3ed569fdef11ae627345ec7..7e9226a0e55bf512a3ed569fdef11ae627345ec7

mode 100755,100644..100755
--- 1/statusnet/statusnet.php
--- 2/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
diff --cc twitter/twitter.php

index c492c6c7300774bef53827ee4621c6977f35ebfd,a6f73c86429ea0d2fdd6be09a27d2759bc51a059..a6f73c86429ea0d2fdd6be09a27d2759bc51a059

mode 100755,100644..100755
--- 1/twitter/twitter.php
--- 2/twitter/twitter.php
+++ b/twitter/twitter.php
author	friendica <info@friendica.com>
	Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)
committer	friendica <info@friendica.com>
	Sat, 21 Jan 2012 23:20:03 +0000 (15:20 -0800)
		1	2
statusnet/statusnet.php	patch \|	diff1 \|	diff2 \|	blob \| history
twitter/twitter.php	patch \|	diff1 \|	diff2 \|	blob \| history