From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 16 Apr 2017 02:17:51 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/conditions?a=commitdiff_plain;h=deb8bdb5bf04396d22ec1d798220c8da12fe0613;p=config

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

deb8bdb5bf04396d22ec1d798220c8da12fe0613