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)
commit4f00ce2e4a587c1165f049ebb3cf5f03104783fd
tree3fa0b2689b4c159fb4793d3299f37dd717d5bce8
parenteb0808dfedc49533505e29b6afb6e9bd5462d236
parent2b3ad87a4dcbd083d26089a54064266d2c0dd515
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