From: Peter Palfrader Date: Sun, 3 May 2009 19:11:36 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4f00ce2e4a587c1165f049ebb3cf5f03104783fd;p=mirror%2Fdsa-puppet.git 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: buildd module on arcadelt, argento puppet auto-upgrading packages is annoying in combination with samhain. basic apache2 stuff on draghi Add draghi buildd on murphy --- 4f00ce2e4a587c1165f049ebb3cf5f03104783fd