]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 21 Feb 2011 20:33:47 +0000 (12:33 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 21 Feb 2011 20:33:47 +0000 (12:33 -0800)

Trivial merge