Merge branch '0.9.x' into adminpanel

author Evan Prodromou <evan@status.net>

Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)

committer Evan Prodromou <evan@status.net>

Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)
author Evan Prodromou <evan@status.net>
Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)
committer Evan Prodromou <evan@status.net>
Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)
diff --cc lib/action.php
Simple merge
diff --cc lib/router.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)
committer	Evan Prodromou <evan@status.net>
	Tue, 17 Nov 2009 13:04:14 +0000 (08:04 -0500)
		1	2
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/router.php	patch \|	diff1 \|	diff2 \|	blob \| history