Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sat, 1 Aug 2009 14:03:21 +0000 (15:03 +0100)
committerStephen Gran <steve@lobefin.net>
Sat, 1 Aug 2009 14:03:21 +0000 (15:03 +0100)
commitb233cbf36fe50a47edd458cc29b8ba9806273e2c
tree50d23be53ab7d7c85d6cb52f09392d09658bcf7d
parent0d5176e1034bd04ce9c76d790caa819f8b8d5341
parent861c0b1a2f92789a17d2f99cbb4f2bca377de8a9
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
manifests/site.pp