From: Stephen Gran Date: Thu, 7 Apr 2011 18:49:05 +0000 (+0100) Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dc0e232ad10ceea5b64f7da7cfdb8569ed64486a;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- dc0e232ad10ceea5b64f7da7cfdb8569ed64486a