From: Evan Prodromou <evan@status.net>
Date: Fri, 17 Jun 2011 13:29:53 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4989fc72d27b50196eeb9b4082305e929a4c5eaf;p=quix0rs-gnu-social.git

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

4989fc72d27b50196eeb9b4082305e929a4c5eaf