]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline...
authorZach Copley <zach@status.net>
Mon, 25 Oct 2010 21:35:56 +0000 (14:35 -0700)
committerZach Copley <zach@status.net>
Mon, 25 Oct 2010 21:35:56 +0000 (14:35 -0700)

Trivial merge