From: Evan Prodromou <evan@status.net>
Date: Sat, 30 Jul 2011 12:10:40 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=44af31decacb8095297b322e57571682a978f57a;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into testing
---

44af31decacb8095297b322e57571682a978f57a