]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Mon, 23 May 2011 22:20:18 +0000 (18:20 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 23 May 2011 22:20:18 +0000 (18:20 -0400)
commitb34e267e538499acc73ccf6bc22c6f4334e69757
treeb2e8471ae0a5fb6777bdc4e07602bce319c76017
parentcb090ab48dd827cd328a500d26f6b41fec73860e
parentfd847c29c517d51851213168c3129b7b5169b5b8
Merge branch '1.0.x' into testing

Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php