From: Evan Prodromou <evan@status.net>
Date: Sat, 24 Sep 2011 14:18:09 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a844c423a9a8408eb79a01763b632c2e1390ad9e;p=quix0rs-gnu-social.git

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

a844c423a9a8408eb79a01763b632c2e1390ad9e