]> git.donarmstrong.com Git - dsa-puppet.git/commit - modules/ferm/templates/defs.conf.erb
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 19:33:26 +0000 (20:33 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 19:33:26 +0000 (20:33 +0100)
commit422c7cbff1fa0db0b11f077a73a0227c9cc775ae
tree5202e5d3aff00edb7f4959fd11353e4d1071ec5e
parentebc615dee252d83de7115bcf52efa77019417241
parent6bb4de914eb8d273a293abd9ffd1fe70a867a00f
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:
  Fix typo
  add my ppp ip as well