From: Evan Prodromou <evan@status.net>
Date: Mon, 20 Jun 2011 13:13:42 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8104b1f766132bf0494694b8971a7932aa237f17;p=quix0rs-gnu-social.git

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

8104b1f766132bf0494694b8971a7932aa237f17