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

author Brion Vibber <brion@pobox.com>

Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)

committer Brion Vibber <brion@pobox.com>

Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)
author Brion Vibber <brion@pobox.com>
Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)
committer Brion Vibber <brion@pobox.com>
Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)
diff --cc lib/command.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)
committer	Brion Vibber <brion@pobox.com>
	Tue, 23 Mar 2010 19:13:32 +0000 (12:13 -0700)
		1	2
lib/command.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history