]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing'
authorEvan Prodromou <evan@status.net>
Tue, 20 Sep 2011 15:08:27 +0000 (11:08 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 20 Sep 2011 15:08:27 +0000 (11:08 -0400)

Trivial merge