projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c687ab4
b34cfc0
)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
author
Martin Zobel-Helas
<zobel@debian.org>
Thu, 3 Dec 2009 14:17:09 +0000
(15:17 +0100)
committer
Martin Zobel-Helas
<zobel@debian.org>
Thu, 3 Dec 2009 14:17:09 +0000
(15:17 +0100)
1
2
modules/named/files/common/named.conf.debian-zones
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/named/files/common/named.conf.debian-zones
Simple merge