From: Stephen Gran Date: Fri, 17 Jun 2011 14:29:31 +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=dd66570732bc7f904931c4565aba0dca9a6915c6;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- dd66570732bc7f904931c4565aba0dca9a6915c6