]> 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>
Fri, 22 Jan 2010 20:59:52 +0000 (12:59 -0800)
committerBrion Vibber <brion@pobox.com>
Fri, 22 Jan 2010 20:59:52 +0000 (12:59 -0800)

Trivial merge