From: Evan Prodromou <evan@status.net>
Date: Sun, 10 Apr 2011 22:32:51 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dcca04fd6fc08e3822d09f24117def6a7b872ae7;p=quix0rs-gnu-social.git

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

dcca04fd6fc08e3822d09f24117def6a7b872ae7