Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 03:57:56 +0000 (05:57 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 18 May 2016 03:57:56 +0000 (05:57 +0200)

Trivial merge