]> 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>
Wed, 9 Dec 2009 20:46:31 +0000 (21:46 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 9 Dec 2009 20:46:31 +0000 (21:46 +0100)

Trivial merge