From: Peter Palfrader Date: Sun, 28 Feb 2010 19:33:26 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=422c7cbff1fa0db0b11f077a73a0227c9cc775ae;p=dsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: Fix typo add my ppp ip as well --- 422c7cbff1fa0db0b11f077a73a0227c9cc775ae