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

Conflicts:

	modules/debian-org/misc/local.yaml

diff --cc modules/debian-org/misc/local.yaml
index 20658dd,60d6f19..9f9429b
--- 1/modules/debian-org/misc/local.yaml
--- 2/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