Merge branch 'master' of ygdrassil_git:/mnt/data/git/master
authorMart Lubbers <mart@martlubbers.net>
Tue, 6 Oct 2015 09:57:31 +0000 (11:57 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 6 Oct 2015 09:57:31 +0000 (11:57 +0200)

Trivial merge