From: Stephen Gran Date: Sat, 5 Feb 2011 10:40:37 +0000 (+0000) 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=8507cbda4065d39c4eb46f1580ac7c7cc72ff56d;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 8507cbda4065d39c4eb46f1580ac7c7cc72ff56d