]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' into 0.9.x
authorEvan Prodromou <evan@status.net>
Wed, 7 Apr 2010 14:46:54 +0000 (10:46 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 7 Apr 2010 14:46:54 +0000 (10:46 -0400)

Trivial merge