From: Stephen Gran Date: Wed, 18 Aug 2010 21:29:51 +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=e8575c6073a8729dac183592ddd13d71ae752dc9;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- e8575c6073a8729dac183592ddd13d71ae752dc9