From: Evan Prodromou <evan@status.net>
Date: Fri, 10 Jun 2011 21:46:44 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=527ed62f3f1a26ff8abfce26c4fb9d6429e374d4;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into testing
---

527ed62f3f1a26ff8abfce26c4fb9d6429e374d4