From: Evan Prodromou <evan@status.net>
Date: Wed, 31 Aug 2011 19:28:25 +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=b53391e500abef00dcf6728eb367a10e5fb8478c;p=quix0rs-gnu-social.git

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

b53391e500abef00dcf6728eb367a10e5fb8478c