Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:26:10 +0000 (14:26 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:26:10 +0000 (14:26 +0200)
commit8523b352f2b2e9a9fb29573d8f20f4202fe7a865
tree7cdf16048edc9860c7b5bd122269f54aabe7683e
parentd8c44af16332b51e607de61369b39e04c5566e48
parent302bfadeb2245517c64c144426a5a7f387d11397
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:
  Revert "pettersson has bpo acpid"