]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Feb 2011 10:01:57 +0000 (11:01 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 19 Feb 2011 10:01:57 +0000 (11:01 +0100)
commit330a065899f896b7b6e1ea737c1d3be02b382f41
tree733929c0492d10ea08430c49e08f1061f0501fc3
parente7b1400a93c9d0a6c5e5039531a95f4a3df1ce0c
parent6986d1b34c1e3223e5e3a0a321cc326a3068b392
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  samhain ignore /etc/apache2/sites-available/www.debian.org
  abel and alwyn run tftpd