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

Trivial merge