projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 788b14e 5872b6a)
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 patch | diff1 | diff2 | blob | history

diff --cc modules/sudo/files/common/sudoers
Simple merge
Unnamed repository; edit this file 'description' to name the repository.