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

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

0b249bce6bfeddf4f49a3fc12eac9a723744c553