From: postblue <postblue+git@postblue.info>
Date: Mon, 12 Jan 2015 13:12:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/nightly' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15140867f14bc37cba25b6a76d1bb938a5af8687;p=quix0rs-gnu-social.git

Merge remote-tracking branch 'upstream/nightly' into nightly
---

15140867f14bc37cba25b6a76d1bb938a5af8687