]> 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, 18 Mar 2010 22:39:04 +0000 (15:39 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 18 Mar 2010 22:39:04 +0000 (15:39 -0700)

Trivial merge