From: Peter Palfrader Date: Mon, 21 Jun 2010 16:56:48 +0000 (+0200) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e24412c3b1c473f30d9ceb3c213145c49be20a6d;p=dsa-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: kaufmann offers rsync fix typo in desc add hkp for kaufmann add kaufmann --- e24412c3b1c473f30d9ceb3c213145c49be20a6d