]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Fri, 9 Apr 2010 17:47:45 +0000 (10:47 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 9 Apr 2010 17:47:45 +0000 (10:47 -0700)

Trivial merge