Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

author Brion Vibber <brion@pobox.com>

Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)

committer Brion Vibber <brion@pobox.com>

Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)
author Brion Vibber <brion@pobox.com>
Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)
committer Brion Vibber <brion@pobox.com>
Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)
diff --cc plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)
committer	Brion Vibber <brion@pobox.com>
	Mon, 7 Feb 2011 20:20:12 +0000 (12:20 -0800)