From: Peter Palfrader Date: Sun, 27 Jun 2010 14:35:00 +0000 (+0200) 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=399d35984a7b52c7e5b30a3e57c36770311a8321;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: s/ries/FTPHOSTS/ --- 399d35984a7b52c7e5b30a3e57c36770311a8321