]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 28 Jun 2010 19:13:39 +0000 (15:13 -0400)
committerBrion Vibber <brion@pobox.com>
Mon, 28 Jun 2010 19:13:39 +0000 (15:13 -0400)

Trivial merge