]> 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, 3 Mar 2010 23:44:29 +0000 (15:44 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 3 Mar 2010 23:44:29 +0000 (15:44 -0800)

Trivial merge