From: Evan Prodromou <evan@status.net>
Date: Wed, 4 May 2011 22:00:50 +0000 (-0700)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=67690b44c51871da55db3d7e24815535e62a4f65;p=quix0rs-gnu-social.git

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

67690b44c51871da55db3d7e24815535e62a4f65