]> 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>
Tue, 2 Mar 2010 23:17:31 +0000 (15:17 -0800)
committerBrion Vibber <brion@pobox.com>
Tue, 2 Mar 2010 23:17:31 +0000 (15:17 -0800)

Trivial merge