Merge branch 'security-upload-host' of https://github.com/aburch/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Fri, 1 Sep 2017 19:42:33 +0000 (21:42 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 1 Sep 2017 19:42:33 +0000 (21:42 +0200)

Trivial merge