From: Evan Prodromou <evan@status.net>
Date: Thu, 5 May 2011 19:09:10 +0000 (-0700)
Subject: Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=763229aedeccfed80a1524deb65b262f75546aea;p=quix0rs-gnu-social.git

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

763229aedeccfed80a1524deb65b262f75546aea