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

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

fdee4190510b88189cc368cb94ec2a01db4cc55f