Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 24 Aug 2010 11:05:13 +0000 (13:05 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 24 Aug 2010 11:05:13 +0000 (13:05 +0200)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  no more puccini here
  bye bye byrd(ie)
  make http_limit opt-in rather than out
  actually reload ferm when the Ferm::Rules change
  only add limit rules where they are going to be used


Trivial merge