]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 21:11:41 +0000 (13:11 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 4 Feb 2010 21:11:41 +0000 (13:11 -0800)

Trivial merge