Merge branch '0.9.x' into testing

author Brion Vibber <brion@pobox.com>

Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)

committer Brion Vibber <brion@pobox.com>

Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)
author Brion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)
committer Brion Vibber <brion@pobox.com>
Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)
diff --cc actions/grouplogo.php
Simple merge
diff --cc lib/action.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)
committer	Brion Vibber <brion@pobox.com>
	Mon, 31 Jan 2011 19:08:15 +0000 (11:08 -0800)
		1	2
actions/grouplogo.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history