]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sat, 16 Apr 2011 19:02:19 +0000 (20:02 +0100)
committerStephen Gran <steve@lobefin.net>
Sat, 16 Apr 2011 19:02:19 +0000 (20:02 +0100)
commitc76fc3f47458065f4e3aeaa018a58bee01b23222
tree7fbd1e51165fff9ac815d3ce14c4acb76767af0a
parent6f4c4f50f387202c43f2d8fdda26b1df846b5b10
parentd97c26c38a37e51c312d9d3639f2d271358be6c8
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
modules/samhain/templates/samhainrc.erb