]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/120' of git://gitorious.org/statusnet/mainline...
authorBrenda Wallace <shiny@cpan.org>
Sun, 24 Jan 2010 02:12:18 +0000 (15:12 +1300)
committerBrenda Wallace <shiny@cpan.org>
Sun, 24 Jan 2010 02:12:18 +0000 (15:12 +1300)

Trivial merge