]> 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, 9 Feb 2010 20:41:46 +0000 (12:41 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 9 Feb 2010 20:41:46 +0000 (12:41 -0800)

Trivial merge