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

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

9dfa4064936a3bbd39ff3ebc660fed47831b0c4e