]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/2' of git://gitorious.org/statusnet-activity/status...
authorEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 19:28:29 +0000 (15:28 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 19:28:29 +0000 (15:28 -0400)

Trivial merge