From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 21 Feb 2010 14:01:19 +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=399f16bef9ea3d90fb1dcfbe2356bd0fdbe1dc9f;hp=399f16bef9ea3d90fb1dcfbe2356bd0fdbe1dc9f;p=mirror%2Fdsa-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:
  Revert "test template"
---