]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Fri, 30 Sep 2011 02:28:44 +0000 (22:28 -0400)
committerEvan Prodromou <evan@status.net>
Fri, 30 Sep 2011 02:28:44 +0000 (22:28 -0400)

Trivial merge