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

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

aca6338d50e3e53c6e7d8edcb4ac8c2e8e2f4452