From: Evan Prodromou <evan@status.net>
Date: Fri, 4 May 2012 15:39:55 +0000 (-0400)
Subject: Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c5ae53166ce4b80cc57055ff220e282147177e4d;p=quix0rs-gnu-social.git

Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
---

c5ae53166ce4b80cc57055ff220e282147177e4d