Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Sat, 5 Feb 2011 10:40:37 +0000 (10:40 +0000)
committerStephen Gran <steve@lobefin.net>
Sat, 5 Feb 2011 10:40:37 +0000 (10:40 +0000)
commit8507cbda4065d39c4eb46f1580ac7c7cc72ff56d
treededcb46fa27dbacb779443fe47fd0f0e35a4b55b
parent507251cb409326409c2e13a365ce901796468d68
parent151f6899a9ad1cd5ffc719a822947b3f43e2ac38
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet