# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1290393004 -3600
# Node ID 575a5689d9a700abaa81d42d69aa48b46a57f37a
# Parent  43e44d4e4a1350c802c6946f9bfcac1f4a49e703# Parent  e8465a131091622e080b016836aba3f92de46d14
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 43e44d4e4a13 -r 575a5689d9a7 db/as/314/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/314/owner	Mon Nov 22 03:30:04 2010 +0100
@@ -0,0 +1,1 @@
+nomius
diff -r 43e44d4e4a13 -r 575a5689d9a7 db/dom/ano/turtleisland/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/turtleisland/owner	Mon Nov 22 03:30:04 2010 +0100
@@ -0,0 +1,1 @@
+nomius
diff -r 43e44d4e4a13 -r 575a5689d9a7 db/ip/01/00/1A/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/1A/cidr	Mon Nov 22 03:30:04 2010 +0100
@@ -0,0 +1,1 @@
+1.0.26.0/24
diff -r 43e44d4e4a13 -r 575a5689d9a7 db/ip/01/00/1A/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/1A/owner	Mon Nov 22 03:30:04 2010 +0100
@@ -0,0 +1,1 @@
+nomius