From: Evan Prodromou <evan@status.net>
Date: Thu, 5 May 2011 01:45:23 +0000 (-0700)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c7511094db000bb858c831e78354b4d0d48b243c;p=quix0rs-gnu-social.git

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

c7511094db000bb858c831e78354b4d0d48b243c