From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 20 Mar 2017 03:32:25 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/reset_cookie?a=commitdiff_plain;h=87820c284f6a32dbabdbead27788ede506ec375c;p=config

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

87820c284f6a32dbabdbead27788ede506ec375c