From: Evan Prodromou <evan@status.net>
Date: Sun, 18 Sep 2011 23:43:55 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7f2f333528fac83086568fc47b0b6dbcf6892038;p=quix0rs-gnu-social.git

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

7f2f333528fac83086568fc47b0b6dbcf6892038