]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Tue, 16 Nov 2010 19:17:29 +0000 (11:17 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 16 Nov 2010 19:17:29 +0000 (11:17 -0800)

Trivial merge