]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/2224' of git://gitorious.org/statusnet/mainline...
authorBrion Vibber <brion@pobox.com>
Mon, 22 Nov 2010 20:31:24 +0000 (12:31 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 22 Nov 2010 20:31:24 +0000 (12:31 -0800)

Trivial merge