From: Evan Prodromou <evan@status.net>
Date: Sun, 16 Oct 2011 08:44:59 +0000 (-0400)
Subject: Merge branch '1.0.x'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f2fa37ea9cd2e7d48c45edf08dca96202099377;p=quix0rs-gnu-social.git

Merge branch '1.0.x'
---

9f2fa37ea9cd2e7d48c45edf08dca96202099377