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

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

63009f1e1bb6c0c7ff055734b49d1b90922ccc1c