From: Evan Prodromou <evan@status.net>
Date: Wed, 3 Aug 2011 15:02:16 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d214953e34edf14f64089f5bb4c95dcb37779a4;p=quix0rs-gnu-social.git

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

7d214953e34edf14f64089f5bb4c95dcb37779a4