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

author Brion Vibber <brion@pobox.com>

Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)

committer Brion Vibber <brion@pobox.com>

Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)
author Brion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)
committer Brion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)
diff --cc lib/apiaction.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)
committer	Brion Vibber <brion@pobox.com>
	Sat, 26 Jun 2010 14:18:03 +0000 (10:18 -0400)
		1	2
lib/apiaction.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history