From: Stephen Gran Date: Sun, 25 Jul 2010 22:34:29 +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=44a5e04998648fc84ff1671d599c404f89bfadc6;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 44a5e04998648fc84ff1671d599c404f89bfadc6