Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 04:48:32 +0000 (06:48 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 04:48:32 +0000 (06:48 +0200)

Trivial merge