From: Evan Prodromou <evan@status.net>
Date: Sat, 28 Jul 2012 17:55:10 +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=f04452c70a2cdc56d001bb5442af8f51382444bd;p=quix0rs-gnu-social.git

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

f04452c70a2cdc56d001bb5442af8f51382444bd