Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet