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

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

65ca0f911e83c227dc8b47c910cdb1c448e7273b