From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Aug 2011 16:50:33 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7db5abff6962da14fc8762185ed99a5c437ae05f;p=quix0rs-gnu-social.git

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

7db5abff6962da14fc8762185ed99a5c437ae05f