Merge branch 'fix-security' of https://gitlab.com/waldi/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Fri, 31 Mar 2017 13:14:55 +0000 (15:14 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 31 Mar 2017 13:15:07 +0000 (15:15 +0200)
Signed-off-by: Julien Cristau <jcristau@debian.org>

Trivial merge