From: Evan Prodromou <evan@status.net>
Date: Mon, 23 May 2011 22:20:18 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b34e267e538499acc73ccf6bc22c6f4334e69757;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into testing

Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
---

b34e267e538499acc73ccf6bc22c6f4334e69757