From: Peter Palfrader Date: Sun, 21 Feb 2010 13:26:33 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=70ba4087483d139cc849b67dc19d8899ccfb529a;p=mirror%2Fdsa-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: test template --- 70ba4087483d139cc849b67dc19d8899ccfb529a