From: Evan Prodromou <evan@status.net>
Date: Wed, 17 Oct 2012 14:10:12 +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=ea14cc7671689392d031739d78dc2cc3c89d1671;p=quix0rs-gnu-social.git

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

ea14cc7671689392d031739d78dc2cc3c89d1671