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

author Brion Vibber <brion@pobox.com>

Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)

committer Brion Vibber <brion@pobox.com>

Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
author Brion Vibber <brion@pobox.com>
Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
committer Brion Vibber <brion@pobox.com>
Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
diff --cc lib/activity.php
Simple merge
diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
committer	Brion Vibber <brion@pobox.com>
	Fri, 19 Mar 2010 22:51:22 +0000 (15:51 -0700)
		1	2
lib/activity.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/classes/Ostatus_profile.php	patch \|	diff1 \|	diff2 \|	blob \| history