]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
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)
* '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


Trivial merge