From: Evan Prodromou <evan@status.net>
Date: Wed, 27 Oct 2010 17:47:54 +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=9e15290963356515e3a0ff31c78a80f012df2042;p=quix0rs-gnu-social.git

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

9e15290963356515e3a0ff31c78a80f012df2042