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

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

0573c268d0b2bc645fc8416a5902b363aee35f2c