From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 24 Mar 2017 04:02:29 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/?p=config;a=commitdiff_plain;h=43644c3abe7266c2c18844670e722b0d60078eb7

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

43644c3abe7266c2c18844670e722b0d60078eb7