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

Merge branch 'master' into nightly
---

0d39337683c8f3fd3a996cf3e80e127ab29dd0fd