From: Evan Prodromou <evan@status.net>
Date: Thu, 21 Apr 2011 20:16:07 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f79d59a081923e935b4c74880ebd8d53484221e0;p=quix0rs-gnu-social.git

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

f79d59a081923e935b4c74880ebd8d53484221e0