From: Evan Prodromou <evan@status.net>
Date: Mon, 18 Oct 2010 19:42:21 +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=3a36714847d6c0170f400038f237d628bb030167;p=quix0rs-gnu-social.git

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

3a36714847d6c0170f400038f237d628bb030167