]> 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>
Thu, 16 Jul 2009 13:24:37 +0000 (15:24 +0200)
committerPeter Palfrader <peter@palfrader.org>
Thu, 16 Jul 2009 13:24:37 +0000 (15:24 +0200)

Trivial merge