Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorMartin Zobel-Helas <zobel@handel.debian.org>
Sat, 18 Mar 2017 19:13:34 +0000 (19:13 +0000)
committerMartin Zobel-Helas <zobel@handel.debian.org>
Sat, 18 Mar 2017 19:13:34 +0000 (19:13 +0000)

Trivial merge