]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 2 Mar 2011 21:52:22 +0000 (13:52 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 2 Mar 2011 21:52:22 +0000 (13:52 -0800)

Trivial merge