]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 17:59:14 +0000 (10:59 -0700)
committerBrion Vibber <brion@pobox.com>
Wed, 19 May 2010 17:59:14 +0000 (10:59 -0700)

Trivial merge