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

Trivial merge