From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 24 Jul 2016 14:30:17 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/condition?a=commitdiff_plain;h=16850fa491742dbe7a209b5b413e2da7fffb4501;p=config

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

16850fa491742dbe7a209b5b413e2da7fffb4501