]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of gitorious.org:statusnet/mainline
authorBrion Vibber <brion@pobox.com>
Tue, 25 May 2010 20:11:36 +0000 (13:11 -0700)
committerBrion Vibber <brion@pobox.com>
Tue, 25 May 2010 20:11:36 +0000 (13:11 -0700)

Trivial merge