Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Fri, 27 Aug 2010 07:40:10 +0000 (08:40 +0100)
committerStephen Gran <steve@lobefin.net>
Fri, 27 Aug 2010 07:40:10 +0000 (08:40 +0100)
commit0c805660b1758c91ab2d82fc645203a704537584
treec420b1d46bf483068c1a648c8aac60e3f0ed9663
parent7e989084f0bc20a1371972d4a83a4be313555bb2
parent6e15bf83682748c31c4d369b960d88078bd474f0
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet