]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Thu, 28 Jan 2010 01:39:03 +0000 (17:39 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 28 Jan 2010 01:39:03 +0000 (17:39 -0800)

Trivial merge