]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 17:20:40 +0000 (13:20 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 17:20:40 +0000 (13:20 -0400)

Trivial merge