From: Zach Copley <zach@status.net>
Date: Fri, 30 Sep 2011 19:52:16 +0000 (+0000)
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=7dcb27672fa3f234f1fdfab5024752614e805341;p=quix0rs-gnu-social.git

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

7dcb27672fa3f234f1fdfab5024752614e805341