From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 30 Apr 2009 19:35:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4de937c7dc6219cb51e2d6402208d260fde5b558;p=dsa-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:
  Raise recursion depth for samhain ignore on etc/puppet
  better header
  Now locals is a template too
  and add a newline
  virtualdomains into a template
  Silly M dashes
  um.  handel is puppetmast4er, not spohr
  Fix the syntax problems.  Some day ....
  Lets see if putting the extra functions in git works
  A little more whitespace.  It wasn't big enough
  Make even purposeless (useless?) hosts have nicely formatted motds
---

4de937c7dc6219cb51e2d6402208d260fde5b558