]> 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, 4 Mar 2010 18:24:42 +0000 (10:24 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Mar 2010 18:24:42 +0000 (10:24 -0800)

Trivial merge