Merge branch 'godard-apache' of https://salsa.debian.org/waldi/dsa-puppet
authorJulien Cristau <jcristau@debian.org>
Sat, 7 Apr 2018 09:21:54 +0000 (11:21 +0200)
committerJulien Cristau <jcristau@debian.org>
Sat, 7 Apr 2018 09:22:08 +0000 (11:22 +0200)
RT#7092


Trivial merge