From: Martin Zobel-Helas Date: Sat, 19 Feb 2011 10:01:57 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=330a065899f896b7b6e1ea737c1d3be02b382f41;p=mirror%2Fdsa-puppet.git 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 --- 330a065899f896b7b6e1ea737c1d3be02b382f41