]> git.donarmstrong.com Git - dsa-puppet.git/commit - manifests/site.pp
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sun, 9 Oct 2011 18:58:42 +0000 (19:58 +0100)
committerStephen Gran <steve@lobefin.net>
Sun, 9 Oct 2011 18:58:42 +0000 (19:58 +0100)
commit04bef57271c14e622e92744a885daaef0de5e2b4
tree03d7939ce4f7806ec7eb579def994962ac6e7693
parent2c5c020b4d26583ec015f3ca45da29b6801280c2
parentb683762d16fefcf8fda1b1178b35c2e5e4cdffa2
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet