]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Fri, 21 May 2010 21:09:05 +0000 (14:09 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 21 May 2010 21:09:05 +0000 (14:09 -0700)

Trivial merge