]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Wed, 22 Dec 2010 18:43:19 +0000 (10:43 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 22 Dec 2010 18:43:19 +0000 (10:43 -0800)

Trivial merge