]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 00:59:59 +0000 (01:59 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 00:59:59 +0000 (01:59 +0100)
commitda5b05d87ed12648ab7f245e26f2e2d7292f1588
treeac5d13ec3dd8c4f2c3211c930471c011fa4f42be
parentccbbcfdfc303c62d2e7d6547df6e3b33d4624403
parent6a9cfcfe08f4735c0a7a19346902dc1969a9264b
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  cleanup a bit
modules/ferm/files/defs.conf