]> git.donarmstrong.com Git - dsa-puppet.git/commit - modules/ferm/templates/defs.conf.erb
Merge branch 'master' of /srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sun, 23 May 2010 13:16:01 +0000 (13:16 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 23 May 2010 13:16:01 +0000 (13:16 +0000)
commitd078736addc38b1d8f05d6db0b4989d50ba5707f
treeb2ccf820a1bc2524395f3f15ea63dce420b4a4e1
parentd43b7564f951127288f4a0a7cd8034df10242bbb
parent678631469f23ba38dff2106772684f35586632f8
Merge branch 'master' of /srv/puppet.debian.org/git/dsa-puppet