From: Evan Prodromou <evan@status.net>
Date: Tue, 3 Jul 2012 19:38:11 +0000 (-0400)
Subject: Merge branch '1.1.x'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=88ce08ca8254823a3df40f8621ce446bb175f7f2;p=quix0rs-gnu-social.git

Merge branch '1.1.x'
---

88ce08ca8254823a3df40f8621ce446bb175f7f2