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

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

23e02ea76a34837ec3b709a52aeadcfa781dcc42