Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Wed, 18 Aug 2010 21:29:51 +0000 (22:29 +0100)
committerStephen Gran <steve@lobefin.net>
Wed, 18 Aug 2010 21:29:51 +0000 (22:29 +0100)
commite8575c6073a8729dac183592ddd13d71ae752dc9
treea35fb075fbe0194a22fbea8525df00e00af3cd49
parent5ac06970309d659aaff62b003c05ebb4ea3d5700
parent5f9b6e60800eeff29318662b84404dc0d23283dc
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet