]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into testing
authorBrion Vibber <brion@pobox.com>
Fri, 26 Feb 2010 17:35:08 +0000 (09:35 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 26 Feb 2010 17:35:08 +0000 (09:35 -0800)

Trivial merge