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

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

f4e17c1bdf42643c2bb530228f88809147992e9d