Merge branch 'master' of git://git.dolda2000.com/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 6 Oct 2017 20:12:16 +0000 (22:12 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 6 Oct 2017 20:12:16 +0000 (22:12 +0200)

Trivial merge