Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet