# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1294864205 -3600
# Node ID 2c4b617af4801cf62437c825624bb8c11b07b27c
# Parent  c35fdaa5fc484714e949f037e962579b8c190024# Parent  6e2661e2a72636e32dc68d9fe35457d062c7af3a
Merge branch 'master' of git://1.3.9.1

diff -r 6e2661e2a726 -r 2c4b617af480 db/as/62487/owner
diff -r 6e2661e2a726 -r 2c4b617af480 db/dom/ano/1984/ns/ns.1984.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/1984/ns/ns.1984.ano	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+1.9.8.4
diff -r 6e2661e2a726 -r 2c4b617af480 db/ip/01/01/7B/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/cidr	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+1.1.123.0/24
diff -r 6e2661e2a726 -r 2c4b617af480 db/ip/01/01/7B/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/7B/owner	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+atiti
diff -r 6e2661e2a726 -r 2c4b617af480 scripts/nameserver_autogen/bind_tld_zonefile