From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 13 Dec 2015 01:07:24 +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=553623a2e333e91423f1f4d6772c8a9a7053ccac

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

553623a2e333e91423f1f4d6772c8a9a7053ccac