]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 15 Apr 2010 21:07:58 +0000 (23:07 +0200)
committerBrion Vibber <brion@pobox.com>
Thu, 15 Apr 2010 21:07:58 +0000 (23:07 +0200)

Trivial merge