Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Tue, 7 Sep 2010 08:07:59 +0000 (09:07 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 7 Sep 2010 08:07:59 +0000 (09:07 +0100)
commitf17c24bcbf94ab71057e5695ef61f849689dd5b0
tree9f15370984a3bc6b65e177217d2540774b1c44b3
parent50d630a7c143db15a8458ad8cc8f8d3ed278464c
parent6d0bb0dd2f33d4cff3687be9a76ad5188a22b2d9
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet