]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Mon, 26 Sep 2011 18:10:43 +0000 (14:10 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 26 Sep 2011 18:10:43 +0000 (14:10 -0400)

Trivial merge