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

author Brion Vibber <brion@pobox.com>

Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)

committer Brion Vibber <brion@pobox.com>

Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
author Brion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
committer Brion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
diff --cc lib/api.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
committer	Brion Vibber <brion@pobox.com>
	Mon, 8 Feb 2010 23:48:52 +0000 (15:48 -0800)
		1	2
lib/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history