]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:09 +0000 (15:49 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 16 Apr 2012 19:49:09 +0000 (15:49 -0400)

Trivial merge