# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1287909007 -7200
# Node ID 59b8096adeb3e5da3265471562442f975000f95d
# Parent  541a2fcacc4c6ee56b25a147bbc8e26d644fd2f9# Parent  99fc6f1152528b1988f2a2b0f048d835aacc55a9
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r 541a2fcacc4c -r 59b8096adeb3 db/as/169/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/169/owner	Sun Oct 24 10:30:07 2010 +0200
@@ -0,0 +1,1 @@
+harald
diff -r 541a2fcacc4c -r 59b8096adeb3 db/ip/01/00/A9/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/A9/cidr	Sun Oct 24 10:30:07 2010 +0200
@@ -0,0 +1,1 @@
+1.0.169.0/24
diff -r 541a2fcacc4c -r 59b8096adeb3 db/ip/01/00/A9/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/A9/owner	Sun Oct 24 10:30:07 2010 +0200
@@ -0,0 +1,1 @@
+harald
diff -r 541a2fcacc4c -r 59b8096adeb3 db/usr/harald/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/harald/git	Sun Oct 24 10:30:07 2010 +0200
@@ -0,0 +1,1 @@
+git://1.0.169.1/ano2.git