From: Evan Prodromou <evan@status.net>
Date: Tue, 19 Apr 2011 00:19:25 +0000 (-0400)
Subject: Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=138ca38b6f39eb01d4b84030d634796077ade7d4;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

Conflicts:
	plugins/EmailRegistration/emailregister.php
---

138ca38b6f39eb01d4b84030d634796077ade7d4