From: Evan Prodromou <evan@status.net>
Date: Sun, 17 Jun 2012 13:53:45 +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=97099e08c5a932a95cab55a3142edb361bd3a9a1;p=quix0rs-gnu-social.git

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

97099e08c5a932a95cab55a3142edb361bd3a9a1