From: Evan Prodromou <evan@status.net>
Date: Mon, 2 May 2011 18:59:47 +0000 (-0700)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=48f6af3a8ac700784790a406e21ed8cbe95c59c7;p=quix0rs-gnu-social.git

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

48f6af3a8ac700784790a406e21ed8cbe95c59c7