From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 12 Dec 2015 15:16:22 +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=604947c3c99a54a4ce5310ec46879be342963d45

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

604947c3c99a54a4ce5310ec46879be342963d45