Merge branch 'master' of ssh://git.slaskete.net:/srv/git/einar-bin
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 4 Nov 2016 11:53:24 +0000 (12:53 +0100)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 4 Nov 2016 11:53:24 +0000 (12:53 +0100)

Trivial merge