]> 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>
Fri, 12 Feb 2010 18:58:29 +0000 (18:58 +0000)
committerBrion Vibber <brion@pobox.com>
Fri, 12 Feb 2010 18:58:29 +0000 (18:58 +0000)

Trivial merge