From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 13 Dec 2015 02:45:18 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/edit?a=commitdiff_plain;h=e37e1c63c7875f17c5c536e43bf83a1d6384df7d;p=config

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

e37e1c63c7875f17c5c536e43bf83a1d6384df7d