From: Evan Prodromou <evan@status.net>
Date: Wed, 22 Jun 2011 21:21:20 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83a8cac9611872dcb40aa0fa00df3af9e4e4f3ea;p=quix0rs-gnu-social.git

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

83a8cac9611872dcb40aa0fa00df3af9e4e4f3ea