From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Sep 2011 18:10:43 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eb711321c375caa146a17f22219da3277e30ad4a;p=quix0rs-gnu-social.git

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

eb711321c375caa146a17f22219da3277e30ad4a