Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns

diff --git a/src/openstreetmap b/src/openstreetmap
index 30967918209e6ee373937bb681ae9a0b3ff93de2..dfb54756614d9ec86856c821d01c243b49a385c0 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -165,6 +165,7 @@
 
 +ridley.openstreetmap:128.40.168.102
 +otrs.openstreetmap:128.40.168.102
++thinkup.openstreetmap:128.40.168.102
 +blog.openstreetmap:128.40.168.102
 +foundation.openstreetmap:128.40.168.102
 +ridley.ucl.openstreetmap:10.0.0.3
@@ -233,11 +234,14 @@
 #+konqi.ic.openstreetmap:10.0.16.1
 #+konqi.oob.openstreetmap:10.0.17.1
 
-# Tile cache server
+# Tile cache servers
 
 +orm.openstreetmap:193.63.75.98
 #+orm.ic.openstreetmap:10.0.16.2
 #+orm.oob.openstreetmap:10.0.17.2
++gorwen.openstreetmap:85.30.159.149
+3gorwen.openstreetmap:2a02008000003ff8020f20fffef66c09
++gorwen.oob.openstreetmap:85.30.129.101
 
 # Blog aggregator (on Shaun McDonald's VM)