From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 6 Oct 2015 12:53:28 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/reset_cookie?a=commitdiff_plain;h=260ffa96ccce634dc2a06780226fdf6851da2a3f;p=config

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

260ffa96ccce634dc2a06780226fdf6851da2a3f