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

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

1328023f880043bf5f608b659d2b26bec97837c7