From: Stephen Gran <steve@lobefin.net>
Date: Tue, 13 Oct 2009 21:20:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0b1ec2d7f59d27596ebc1f2ecf30a900dbdad7da;hp=d656940e8a36439fa782a2f2966087d5cbebd66c;p=dsa-puppet.git

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

diff --git a/modules/geodns/files/common/named.conf.acl b/modules/geodns/files/common/named.conf.acl
index b0877d81..f04c9b87 100644
--- a/modules/geodns/files/common/named.conf.acl
+++ b/modules/geodns/files/common/named.conf.acl
@@ -119,7 +119,6 @@ acl AS {
 	country_TJ;
 	country_TL;
 	country_TM;
-	country_TR;
 	country_TW;
 	country_UZ;
 	country_VN;
@@ -177,6 +176,7 @@ acl EU {
 	country_SJ;
 	country_SK;
 	country_SM;
+	country_TR;
 	country_UA;
 	country_VA;
 };