From: Evan Prodromou <evan@status.net>
Date: Sat, 27 Aug 2011 19:22:14 +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=a14224d6871297a14743e6473498b2ed2c1ed22e;p=quix0rs-gnu-social.git

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

a14224d6871297a14743e6473498b2ed2c1ed22e