From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 8 Feb 2017 17:15:51 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/git-logo.png?a=commitdiff_plain;h=9979af5e31e161f257c972fa2addc017a4739dd8;hp=-c;p=config

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

9979af5e31e161f257c972fa2addc017a4739dd8