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

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

0f53c07f56165c2ad3b4f1c908062f1f051e9a5b