Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 27 Jun 2010 14:35:00 +0000 (16:35 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 27 Jun 2010 14:35:00 +0000 (16:35 +0200)
commit399d35984a7b52c7e5b30a3e57c36770311a8321
tree0708d688fd034b2a8ff06361845e807434fd21ba
parente4f97bb49efdfe59162c033e1dbf7439d588bffe
parent26097605f7821bc8ec1598b11675a5c15afd0542
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/