From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 14 Dec 2016 19:52:50 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/?p=config;a=commitdiff_plain;h=fe7712ea200dee8b0ba5db3f26a974a248f0786c

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

fe7712ea200dee8b0ba5db3f26a974a248f0786c