From: Peter Palfrader Date: Tue, 10 Nov 2009 11:10:17 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d04337a5dcdf53f5805e7828c398252c1b8389da;p=mirror%2Fdsa-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: um, the point of splitting out reservedaddrs was for ball. Explicitly giving it the default list is probably not useful klecker no longer handles security.d.o mail this is a wierd one, but grep for the patten on powell --- d04337a5dcdf53f5805e7828c398252c1b8389da