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

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

f5aba994b2ca6dbe9d4dfd83d615d7bc3dcf2982