Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Wed, 12 Aug 2009 08:30:00 +0000 (10:30 +0200)
committerPeter Palfrader <peter@palfrader.org>
Wed, 12 Aug 2009 08:30:00 +0000 (10:30 +0200)
commit04ebaf0ea2847320c59ffa26ea6f40aa466c86a8
tree28f497158e1f65c894a6f47c02b8016eab4b04ac
parent96ab8ff71e97d604949d12d5dcb3ad04f9b89a9c
parent52e3fe25826c6269de1ca3123c2d493fbee67d55
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  ignore /etc/bind as well
  Make bind write to a subdirectory of /var/log