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

Trivial merge