]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 15:53:08 +0000 (07:53 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 15:53:08 +0000 (07:53 -0800)

Trivial merge