]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'emailsitesetup' into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 28 Apr 2011 19:44:21 +0000 (12:44 -0700)
committerEvan Prodromou <evan@status.net>
Thu, 28 Apr 2011 19:44:21 +0000 (12:44 -0700)

Trivial merge