From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 5 Nov 2015 15:07:05 +0000 (+0100)
Subject: Merge branch 'master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c950f1854623f0df2a50c193f624f0a0bf1fcbb3;p=quix0rs-gnu-social.git

Merge branch 'master' into nightly

Some merge requests that were aimed at master
---

c950f1854623f0df2a50c193f624f0a0bf1fcbb3