]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 19:09:30 +0000 (15:09 -0400)
committerBrion Vibber <brion@pobox.com>
Sat, 26 Jun 2010 19:09:30 +0000 (15:09 -0400)

Trivial merge