Merge branch 'master' of ssh://wowbagger.slaskete.net/srv/git/einar-bin
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Sun, 29 Jul 2018 11:36:04 +0000 (13:36 +0200)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Sun, 29 Jul 2018 11:36:04 +0000 (13:36 +0200)

Trivial merge