From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 17:56:55 +0000 (-0500)
Subject: Merge branch 'testing' into privategroup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99db745f9d8746e3170bf779746d855c44f0b951;p=quix0rs-gnu-social.git

Merge branch 'testing' into privategroup

Conflicts:
	lib/groupeditform.php
---

99db745f9d8746e3170bf779746d855c44f0b951