]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 1 Jul 2009 19:24:11 +0000 (20:24 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 1 Jul 2009 19:24:11 +0000 (20:24 +0100)
commitf08c3acf68b15929cd5e008538ce7864f859a582
tree0d8aaf80ec80bf19539c6be324cb94ec9f2d0d63
parentdf2e7cda3888fc73e0b53c2245b4a033d82caa45
parentcc7c04ac3c00527448cfb667eb4af7c5d6ce9ce9
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

Conflicts:
modules/geodns/files/common/named.conf.local

Signed-off-by: Stephen Gran <steve@lobefin.net>