From: Stephen Gran Date: Sun, 9 Oct 2011 18:58:42 +0000 (+0100) Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=04bef57271c14e622e92744a885daaef0de5e2b4 Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 04bef57271c14e622e92744a885daaef0de5e2b4