Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 24 Jul 2009 18:09:31 +0000 (20:09 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 24 Jul 2009 18:09:31 +0000 (20:09 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Add host based blacklist
  Will this fix it?  Who knows?  Who understands the mystery of the puppet?


Trivial merge