From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 11 Oct 2015 19:46:12 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/?p=config;a=commitdiff_plain;h=a18dccfc198b42318da43314b3a1d4c5a621a029

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

a18dccfc198b42318da43314b3a1d4c5a621a029