From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 20 Aug 2011 19:29:57 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7dbf6f0c9acd692efd3bd716dddd5ba34700022b;p=mirror%2Fdsa-puppet.git

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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  no more afs stuff
  antheil → squeeze
  agricola, abel → squeeze
  arcadelt → squeeze
  Hard code merikanto and orff's IPs for NAT-ed hosts
  Add virt_aliases_regex router
  Strip [] out of the RT tag too
---

7dbf6f0c9acd692efd3bd716dddd5ba34700022b