From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 14 Dec 2015 21:07:06 +0000 (+0100)
Subject: Merge branch 'master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c2ea85a5e29038569576bd521c6c6710e2159d06;p=quix0rs-gnu-social.git

Merge branch 'master' into nightly
---

c2ea85a5e29038569576bd521c6c6710e2159d06