]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 22:30:10 +0000 (15:30 -0700)
committerBrion Vibber <brion@pobox.com>
Mon, 4 Oct 2010 22:30:10 +0000 (15:30 -0700)

Trivial merge