Merge remote branch 'statusnet/0.9.x' into 0.9.x

author Brion Vibber <brion@pobox.com>

Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)

committer Brion Vibber <brion@pobox.com>

Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)
author Brion Vibber <brion@pobox.com>
Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)
committer Brion Vibber <brion@pobox.com>
Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)
diff --cc actions/groupblock.php
Simple merge
diff --cc actions/passwordsettings.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)
committer	Brion Vibber <brion@pobox.com>
	Tue, 10 Nov 2009 14:44:53 +0000 (06:44 -0800)
		1	2
actions/groupblock.php	patch \|	diff1 \|	diff2 \|	blob \| history
actions/passwordsettings.php	patch \|	diff1 \|	diff2 \|	blob \| history