Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 26 Aug 2010 22:10:54 +0000 (00:10 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 26 Aug 2010 22:10:54 +0000 (00:10 +0200)
1  2 
modules/debian-org/misc/local.yaml
modules/sudo/files/common/sudoers

Simple merge
Simple merge