From: Evan Prodromou <evan@status.net>
Date: Mon, 26 Sep 2011 21:06:14 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9f83008b86e753501045ed2ffa9ac3be1657d28;p=quix0rs-gnu-social.git

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

a9f83008b86e753501045ed2ffa9ac3be1657d28