# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1297733411 -3600
# Node ID fac089efa5b4e58af3c6da928c7214c4f35d629a
# Parent  e7f35d6f87b10c569b26f744a64ea6bfe2756110# Parent  5393c823be88183b1d7bd19e6009a347a3b553fa
Merge branch 'master' of git://git1.somerandomnick.ano

diff -r e7f35d6f87b1 -r fac089efa5b4 db/as/170/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/170/owner	Tue Feb 15 02:30:11 2011 +0100
@@ -0,0 +1,1 @@
+harald
diff -r e7f35d6f87b1 -r fac089efa5b4 db/ip/01/00/AA/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/AA/cidr	Tue Feb 15 02:30:11 2011 +0100
@@ -0,0 +1,1 @@
+1.0.170.0/24
diff -r e7f35d6f87b1 -r fac089efa5b4 db/ip/01/00/AA/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/AA/owner	Tue Feb 15 02:30:11 2011 +0100
@@ -0,0 +1,1 @@
+harald
diff -r e7f35d6f87b1 -r fac089efa5b4 db/usr/harald/git
--- a/db/usr/harald/git	Fri Feb 11 09:30:14 2011 +0100
+++ b/db/usr/harald/git	Tue Feb 15 02:30:11 2011 +0100
@@ -1,1 +1,1 @@
-git://1.0.169.1/ano2.git
+git://1.0.169.14/ano.git