]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 26 Jan 2011 22:59:35 +0000 (14:59 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 26 Jan 2011 22:59:35 +0000 (14:59 -0800)

Trivial merge