Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/pdm master
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 13 May 2016 20:32:05 +0000 (22:32 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 13 May 2016 20:32:05 +0000 (22:32 +0200)

Trivial merge