From: Evan Prodromou <evan@status.net>
Date: Tue, 2 Aug 2011 17:13:10 +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=f6a7335ccd3191bcd87e57545e8081b2f63f76ea;p=quix0rs-gnu-social.git

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

f6a7335ccd3191bcd87e57545e8081b2f63f76ea