]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:54:41 +0000 (10:54 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 20 Oct 2011 14:54:41 +0000 (10:54 -0400)

Trivial merge