]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Wed, 10 Mar 2010 17:53:55 +0000 (09:53 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 10 Mar 2010 17:53:55 +0000 (09:53 -0800)

Trivial merge