]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Thu, 2 Sep 2010 20:56:52 +0000 (16:56 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 2 Sep 2010 20:56:52 +0000 (16:56 -0400)

Trivial merge