]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 19 Apr 2010 16:47:11 +0000 (18:47 +0200)
committerBrion Vibber <brion@pobox.com>
Mon, 19 Apr 2010 16:47:11 +0000 (18:47 +0200)

Trivial merge