]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 14:01:19 +0000 (15:01 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 14:01:19 +0000 (15:01 +0100)
commit399f16bef9ea3d90fb1dcfbe2356bd0fdbe1dc9f
treea6fbaf13161eec4953261c4b21a8ca7479c1d813
parent061b70ee46454cdadfc60b9731e845210cf052bf
parent0a8f0c4605ecb51df1952d88d1183ad804120cec
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"