]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 13 Dec 2010 23:45:01 +0000 (00:45 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 13 Dec 2010 23:45:01 +0000 (00:45 +0100)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Also allow apt-get update

1  2 
modules/sudo/files/common/sudoers

Simple merge