]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline...
authorBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 17:14:42 +0000 (09:14 -0800)
committerBrion Vibber <brion@pobox.com>
Thu, 25 Feb 2010 17:14:42 +0000 (09:14 -0800)

Trivial merge