From: Stephen Gran Date: Tue, 7 Sep 2010 08:07:59 +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=f17c24bcbf94ab71057e5695ef61f849689dd5b0;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- f17c24bcbf94ab71057e5695ef61f849689dd5b0