From: Stephen Gran Date: Wed, 27 Jul 2011 18:53:08 +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=bd99267c6cb1f4802806809562a9b1cfb31b882a;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- bd99267c6cb1f4802806809562a9b1cfb31b882a