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

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

51a7e9961d0a6d94f7788ba9e670511a7e26f6e6