Merge branch '1.0.x' into testing

author Evan Prodromou <evan@status.net>

Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)

committer Evan Prodromou <evan@status.net>

Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
author Evan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
committer Evan Prodromou <evan@status.net>
Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
diff --cc actions/apigrouplistall.php
Simple merge
diff --cc lib/framework.php
Simple merge
author	Evan Prodromou <evan@status.net>
	Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
committer	Evan Prodromou <evan@status.net>
	Tue, 5 Apr 2011 17:16:28 +0000 (13:16 -0400)
		1	2
actions/apigrouplistall.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/framework.php	patch \|	diff1 \|	diff2 \|	blob \| history