From: Evan Prodromou <evan@status.net>
Date: Fri, 5 Aug 2011 14:42:42 +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=8b32ac85d8cbfe1be03836af461d80fddd54fc6c;p=quix0rs-gnu-social.git

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

8b32ac85d8cbfe1be03836af461d80fddd54fc6c