Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd master
authorFredrik Tolf <fredrik@dolda2000.com>
Sat, 2 Feb 2019 14:44:52 +0000 (15:44 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Sat, 2 Feb 2019 14:44:52 +0000 (15:44 +0100)

Trivial merge