Merge branch 'master' of git://git.debian.org/mirror/dsa-puppet

diff --combined modules/debian-org/misc/local.yaml
index 5d7af86f071570234588e81291298f10db70940b,35d70234ed81d3f8d7e0b469ebe8b4f9acad97cc..709cbd0012e81c4c8e08a91efc2ea02e77d3aacb
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -204,6 -204,7 +204,6 @@@ host_settings
      - goedel.debian.org
      - goetz.debian.org
      - krenek.debian.org
 -    - lafayette.debian.org
      - lebrun.debian.org
      - lucatelli.debian.org
      - malo.debian.org
@@@ -222,6 -223,7 +222,7 @@@
      - vitry.debian.org
      - voltaire.debian.org
      - zandonai.debian.org
+     - zee.debian.org
    squeeze:
      - alkman.debian.org
      - arne.debian.org
@@@ -408,3 -410,5 +409,3 @@@
      - widor.debian.org
  #  reservedaddrs:
  #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
 ----
 -