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

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

4176a05f2039b6c9f4dfad42cc66b0e4bd455db6