]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6218c7c 0fd4e85)
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 patch | diff1 | diff2 | blob | history
modules/sudo/files/common/sudoers patch | diff1 | diff2 | blob | history

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