]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 23:56:15 +0000 (16:56 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 16 Aug 2010 23:56:15 +0000 (16:56 -0700)

Trivial merge