]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge commit 'refs/merge-requests/170' of git://gitorious.org/statusnet/mainline...
authorEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:05:41 +0000 (15:05 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 21 Sep 2011 19:05:41 +0000 (15:05 -0400)

Trivial merge