From: Stephen Gran Date: Fri, 10 Jun 2011 19:20:56 +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=2249f2e8a1fad18f9a6a9195ebc912ee448e0005;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 2249f2e8a1fad18f9a6a9195ebc912ee448e0005