From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 13 Dec 2015 01:03:33 +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=2d1f18a11badc239cd7ab1638f8988087fd803ea

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

2d1f18a11badc239cd7ab1638f8988087fd803ea