From: Evan Prodromou <evan@status.net>
Date: Wed, 1 Jun 2011 14:21:54 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a4750b44dff3561e9da8ea2300413d87d30463b9;p=quix0rs-gnu-social.git

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

a4750b44dff3561e9da8ea2300413d87d30463b9