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/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/templates?a=commitdiff_plain;h=2d1f18a11badc239cd7ab1638f8988087fd803ea;p=config

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

2d1f18a11badc239cd7ab1638f8988087fd803ea