]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 14 Jun 2010 17:53:22 +0000 (10:53 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 14 Jun 2010 17:53:22 +0000 (10:53 -0700)

Trivial merge