From: Martin Zobel-Helas Date: Tue, 13 Aug 2013 20:24:16 +0000 (+0200) 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=a50790e32daa275193f02f19520aa7efb896128f;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: Add philp Add philp multipath entry --- a50790e32daa275193f02f19520aa7efb896128f