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

author Brion Vibber <brion@pobox.com>

Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)

committer Brion Vibber <brion@pobox.com>

Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)
author Brion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)
committer Brion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)
diff --cc lib/queuemanager.php
Simple merge
diff --cc lib/util.php
Simple merge
diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)
committer	Brion Vibber <brion@pobox.com>
	Wed, 24 Feb 2010 23:47:51 +0000 (15:47 -0800)
		1	2
lib/queuemanager.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/OStatus/OStatusPlugin.php	patch \|	diff1 \|	diff2 \|	blob \| history