Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 2 Mar 2017 04:49:00 +0000 (05:49 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 2 Mar 2017 04:49:00 +0000 (05:49 +0100)

Trivial merge