]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 10 Feb 2010 19:12:11 +0000 (11:12 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 10 Feb 2010 19:12:11 +0000 (11:12 -0800)

Trivial merge