From: Christian Heller Date: Sun, 11 Oct 2015 19:46:12 +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/cards/%7B%7Bcard_id%7D%7D/process?a=commitdiff_plain;h=a18dccfc198b42318da43314b3a1d4c5a621a029;p=config Merge branch 'master' of github.com/plomlompom/config --- a18dccfc198b42318da43314b3a1d4c5a621a029