Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 3 May 2009 19:11:36 +0000 (21:11 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 3 May 2009 19:11:36 +0000 (21:11 +0200)
* '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


Trivial merge