From: Peter Palfrader Date: Tue, 19 Jun 2012 19:27:42 +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/?p=dsa-puppet.git;a=commitdiff_plain;h=f47e3bc07ecb609dd2f180925300aa3bf503ef66 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 "bad hack - take away in a day or so" --- f47e3bc07ecb609dd2f180925300aa3bf503ef66