From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 25 Aug 2011 08:24:34 +0000 (+0200)
Subject: merulo → squeeze
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cb45f34210ee38034a6a38001f10496bc264bf2d;p=mirror%2Fdsa-puppet.git

merulo → squeeze
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 6aa29e12c..c7d528a32 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -290,6 +290,7 @@ host_settings:
     - luchesi.debian.org
     - master.debian.org
     - merikanto.debian.org
+    - merulo.debian.org
     - morricone.debian.org
     - mundy.debian.org
     - murphy.debian.org