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

author Brion Vibber <brion@pobox.com>

Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)

committer Brion Vibber <brion@pobox.com>

Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)
author Brion Vibber <brion@pobox.com>
Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)
committer Brion Vibber <brion@pobox.com>
Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)
diff --cc EVENTS.txt
Simple merge
diff --cc lib/command.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)
committer	Brion Vibber <brion@pobox.com>
	Wed, 24 Mar 2010 21:11:01 +0000 (14:11 -0700)
		1	2
EVENTS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
lib/command.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history