From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Nov 2011 16:56:32 +0000 (-0500)
Subject: Merge branch '1.0.x'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=68676ad31da00f8b5bdade22eb3a07f52a3c976a;p=quix0rs-gnu-social.git

Merge branch '1.0.x'
---

68676ad31da00f8b5bdade22eb3a07f52a3c976a