]> 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>
Thu, 25 Mar 2010 20:04:09 +0000 (13:04 -0700)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Mar 2010 20:04:09 +0000 (13:04 -0700)

Trivial merge