]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df2e7cd cc7c04a)
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)
Conflicts:
modules/geodns/files/common/named.conf.local

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.