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

Merge branch '1.0.x'
---

a294ccb96b9652ddcdc7b2b7f943af88c783acb1