]> 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>
Tue, 23 Feb 2010 00:52:47 +0000 (00:52 +0000)
committerBrion Vibber <brion@pobox.com>
Tue, 23 Feb 2010 00:52:47 +0000 (00:52 +0000)

Trivial merge