From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 6 Jul 2009 15:34:58 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=79b064ca9b0e6a77eed810ce41c66a3d594a0996;p=mirror%2Fdsa-puppet.git

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

Conflicts:

	modules/debian-org/misc/local.yaml
---

79b064ca9b0e6a77eed810ce41c66a3d594a0996
diff --cc modules/debian-org/misc/local.yaml
index 20658dd0e,60d6f1980..9f9429b26
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -101,7 -107,7 +107,8 @@@ host_settings
      - saens.debian.org
      - samosa.debian.org
      - senfl.debian.org
 +    - gluck.debian.org
+     - spohr.debian.org
      - tartini.debian.org
    buildd:
      - ancina.debian.org