From: Evan Prodromou <evan@status.net>
Date: Wed, 21 Mar 2012 20:40:51 +0000 (-0400)
Subject: Merge branch '1.0.x'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d98a4be24ed6fc6b14ae23931e428cd4db47fe06;p=quix0rs-gnu-social.git

Merge branch '1.0.x'
---

d98a4be24ed6fc6b14ae23931e428cd4db47fe06