Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorStephen Gran <steve@lobefin.net>
Tue, 29 Mar 2011 19:12:11 +0000 (20:12 +0100)
committerStephen Gran <steve@lobefin.net>
Tue, 29 Mar 2011 19:12:11 +0000 (20:12 +0100)
commit816f97a070a1f8e1d2b89492697a7d9288ffe846
tree83a29becd098b413b512fb4d3863b422262991df
parentba65c0a7a2b53cc5013050997b6f6e9ec44397f5
parent9e768f19257bece5002132ea4a66467334c7cc2f
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
modules/debian-org/misc/local.yaml