From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 16 Apr 2017 00:02:40 +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=772eb56067742b3f680f30fe55bac547cf74b5f2

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

772eb56067742b3f680f30fe55bac547cf74b5f2