From: Evan Prodromou <evan@status.net>
Date: Tue, 2 Aug 2011 19:20:00 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=575ecd9f4c7e2544f1ae43e7838f1be6a9af4dc4;p=quix0rs-gnu-social.git

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

575ecd9f4c7e2544f1ae43e7838f1be6a9af4dc4