Merge branch 'master' of ygdrassil:/mnt/data/git/master
authorMart Lubbers <mart@martlubbers.net>
Tue, 6 Oct 2015 11:21:52 +0000 (13:21 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 6 Oct 2015 11:21:52 +0000 (13:21 +0200)

Trivial merge