From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 11 Oct 2015 18:17:52 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/reset_cookie?a=commitdiff_plain;h=9737783f88e127c687b8e6603f404cea810723cc;p=config

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

9737783f88e127c687b8e6603f404cea810723cc