From: Evan Prodromou <evan@status.net>
Date: Tue, 24 Apr 2012 01:02:22 +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=482b80cb0c2c9874ede157f3f9eb7616efccbe11;p=quix0rs-gnu-social.git

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

482b80cb0c2c9874ede157f3f9eb7616efccbe11