From: Zach Copley <zach@status.net>
Date: Wed, 13 Jul 2011 23:03:56 +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=37dbaf6c01ec20e4659c41c7f4b631fac94730f4;p=quix0rs-gnu-social.git

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

37dbaf6c01ec20e4659c41c7f4b631fac94730f4