From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 21 Mar 2017 18:27:11 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/todo?a=commitdiff_plain;h=70f6d0b5b32520a3d7070f81aaba6bfe82da964e;p=config

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

70f6d0b5b32520a3d7070f81aaba6bfe82da964e