From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 17 Oct 2015 11:53:58 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/static/templates?a=commitdiff_plain;h=c6f29ff2939adce21c8da7ec90680fafe031b578;p=config

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

c6f29ff2939adce21c8da7ec90680fafe031b578