From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 9 Dec 2009 20:46:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=82b1041c8420f1bacd24edcc938dac995e3658d3;hp=82b1041c8420f1bacd24edcc938dac995e3658d3;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---