]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote branch 'statusnet/master' into testing
authorBrion Vibber <brion@pobox.com>
Mon, 1 Feb 2010 17:04:13 +0000 (09:04 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 1 Feb 2010 17:04:13 +0000 (09:04 -0800)

Trivial merge