From: Evan Prodromou <evan@status.net>
Date: Mon, 16 Apr 2012 19:49:09 +0000 (-0400)
Subject: Merge branch '1.0.x'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=36d724cf03f5c0a29c9a30c2fb51d631a7f1edba;p=quix0rs-gnu-social.git

Merge branch '1.0.x'
---

36d724cf03f5c0a29c9a30c2fb51d631a7f1edba