From: Evan Prodromou <evan@status.net>
Date: Wed, 21 Sep 2011 19:24:17 +0000 (-0400)
Subject: Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12588b1cf73fad7d0a76a29a46ec355150eaa54e;p=quix0rs-gnu-social.git

Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166
---

12588b1cf73fad7d0a76a29a46ec355150eaa54e