]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:40:28 +0000 (23:40 +0000)
committerBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:40:28 +0000 (23:40 +0000)

Trivial merge