Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

author Evan Prodromou <evan@status.net>

Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)

committer Evan Prodromou <evan@status.net>

Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
author Evan Prodromou <evan@status.net>
Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
committer Evan Prodromou <evan@status.net>
Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
diff --cc plugins/OStatus/lib/discovery.php
Simple merge
diff --cc plugins/OStatus/lib/feeddiscovery.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
committer	Evan Prodromou <evan@status.net>
	Wed, 17 Mar 2010 14:38:39 +0000 (09:38 -0500)
		1	2
plugins/OStatus/lib/discovery.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/lib/feeddiscovery.php	patch \|	diff1 \|	diff2 \|	blob \| history