# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1287169204 -7200
# Node ID d31c5102047fdc00a145e15b84546165923d9a8a
# Parent  2d7b11511c129f38f9c79d542a6a8d3c9c28b60e# Parent  de420370c4ff7bedcde68cda1ca0f32f8fcf6762
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 2d7b11511c12 -r d31c5102047f db/as/6666/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/6666/owner	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+astrosmash
diff -r 2d7b11511c12 -r d31c5102047f db/dom/ano/astrosmash/ns/ns1.astrosmash.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/astrosmash/ns/ns1.astrosmash.ano	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+1.1.90.10
diff -r 2d7b11511c12 -r d31c5102047f db/dom/ano/astrosmash/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/astrosmash/owner	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+astrosmash
diff -r 2d7b11511c12 -r d31c5102047f db/ip/01/01/5A/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/5A/cidr	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+1.1.90.0/24
diff -r 2d7b11511c12 -r d31c5102047f db/ip/01/01/5A/ns/ns1.astrosmash.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/5A/ns/ns1.astrosmash.ano	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+1.1.90.10
diff -r 2d7b11511c12 -r d31c5102047f db/ip/01/01/5A/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/01/5A/owner	Fri Oct 15 21:00:04 2010 +0200
@@ -0,0 +1,1 @@
+astrosmash