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

Trivial merge