]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 22:57:05 +0000 (15:57 -0700)
committerEvan Prodromou <evan@status.net>
Tue, 3 Aug 2010 22:57:05 +0000 (15:57 -0700)

Trivial merge