Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 16:56:48 +0000 (18:56 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 21 Jun 2010 16:56:48 +0000 (18:56 +0200)
commite24412c3b1c473f30d9ceb3c213145c49be20a6d
treec9ff4055f537b9e93e44c311f879018fbdad5482
parentc20773059b2aadcfbe11e4ebb03d6fe66b0662ae
parent60856336673c0e432966c18b5afb2377b1891a16
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:
  kaufmann offers rsync
  fix typo in desc
  add hkp for kaufmann
  add kaufmann