From: Stephen Gran Date: Sat, 16 Apr 2011 19:02:19 +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=c76fc3f47458065f4e3aeaa018a58bee01b23222;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- c76fc3f47458065f4e3aeaa018a58bee01b23222