]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into emailregistration
authorEvan Prodromou <evan@status.net>
Sun, 17 Apr 2011 21:48:15 +0000 (17:48 -0400)
committerEvan Prodromou <evan@status.net>
Sun, 17 Apr 2011 21:48:15 +0000 (17:48 -0400)

Trivial merge