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

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

6d5b6d98b5f68d784fee736518eaaae7a26a51f6