]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:32 +0000 (11:56 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:32 +0000 (11:56 -0500)

Trivial merge