From: Evan Prodromou <evan@status.net>
Date: Tue, 27 Sep 2011 15:33:13 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9143d4f38493da81328317100b34a37dd67fde54;p=quix0rs-gnu-social.git

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

9143d4f38493da81328317100b34a37dd67fde54