From: Stephen Gran Date: Tue, 21 Sep 2010 20:31:29 +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=5f276955049209ccc1381652d75041d21a11fea5;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 5f276955049209ccc1381652d75041d21a11fea5