]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 28 Sep 2011 20:14:42 +0000 (16:14 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 28 Sep 2011 20:14:42 +0000 (16:14 -0400)

Trivial merge