From: Evan Prodromou <evan@status.net>
Date: Tue, 29 Mar 2011 21:31:17 +0000 (-0400)
Subject: Merge remote branch 'gitorious/1.0.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3898039617dd3f8dd317b7a2b3bf8e097277777a;p=quix0rs-gnu-social.git

Merge remote branch 'gitorious/1.0.x' into 1.0.x
---

3898039617dd3f8dd317b7a2b3bf8e097277777a