From: Evan Prodromou Date: Sun, 17 Apr 2011 21:48:15 +0000 (-0400) Subject: Merge branch '1.0.x' into emailregistration X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b9eee437dd6d1b6fe6bc3e04993f339a1397d671;p=quix0rs-gnu-social.git Merge branch '1.0.x' into emailregistration --- b9eee437dd6d1b6fe6bc3e04993f339a1397d671