]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 13 Oct 2010 19:04:20 +0000 (12:04 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 13 Oct 2010 19:04:20 +0000 (12:04 -0700)

Trivial merge