From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 28 Sep 2009 08:57:59 +0000 (+0200)
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=c7c04448723b39228f2cf19b0c15c6158dfae8d7;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:
  but fano, surprisingly, has a different IP than finzi
  dijkstra also relays for fano
  still picky erb
  picky picky erb
  silly typo
  inc-debian.org now a template
  Remove samosa from nrpe allowed hosts, add draghi
  looks like I broke this when switching to named variables
---

c7c04448723b39228f2cf19b0c15c6158dfae8d7