From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 15 Apr 2017 17:57:48 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/?p=config;a=commitdiff_plain;h=a1fb2ec9202b8414d1400904aaaf464cf53f67de

Merge branch 'master' of https://github.com/plomlompom/config
---

a1fb2ec9202b8414d1400904aaaf464cf53f67de