From: Peter Palfrader Date: Sun, 23 May 2010 12:26:10 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8523b352f2b2e9a9fb29573d8f20f4202fe7a865;p=dsa-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: Revert "pettersson has bpo acpid" --- 8523b352f2b2e9a9fb29573d8f20f4202fe7a865