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

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

9f6adb3f52890a9d4215aaca501d95320a20f252