]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 18 Jul 2011 14:44:35 +0000 (10:44 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 18 Jul 2011 14:44:35 +0000 (10:44 -0400)

Trivial merge