From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 6 Oct 2015 11:21:52 +0000 (+0200)
Subject: Merge branch 'master' of ygdrassil:/mnt/data/git/master
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=c6872b097d9426301ce49bf8e4823071c9f589e1;p=master.git

Merge branch 'master' of ygdrassil:/mnt/data/git/master
---

c6872b097d9426301ce49bf8e4823071c9f589e1