]> 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>
Thu, 18 Feb 2010 18:22:02 +0000 (18:22 +0000)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Feb 2010 18:22:02 +0000 (18:22 +0000)

Trivial merge