Merge branch 'master' of ssh://git.slaskete.net/srv/git/einar-bin
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Mon, 29 Jul 2019 19:27:12 +0000 (21:27 +0200)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Mon, 29 Jul 2019 19:27:12 +0000 (21:27 +0200)

Trivial merge