From: Stephen Gran Date: Sat, 21 May 2011 17:00:48 +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=802933ac23f7433f1990141cf2623d888ba7790d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 802933ac23f7433f1990141cf2623d888ba7790d