From: Martin Zobel-Helas Date: Fri, 16 Mar 2012 08:10:46 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a42f4d2b6269546e443fc9580971ba1d909f8727;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: New addressrange at conova --- a42f4d2b6269546e443fc9580971ba1d909f8727