# HG changeset patch
# User pragmo <me@pragmo.ano>
# Date 1297741244 0
# Node ID 6134d4251b9f938681ec4d69428168b27d3eec44
# Parent  fa727518fd73fe7c3844d028c3ed1c99a27fad93# Parent  fac089efa5b4e58af3c6da928c7214c4f35d629a
Merge branch 'master' of git://1.33.92.1

diff -r fa727518fd73 -r 6134d4251b9f db/as/170/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/170/owner	Tue Feb 15 03:40:44 2011 +0000
@@ -0,0 +1,1 @@
+harald
diff -r fa727518fd73 -r 6134d4251b9f 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 03:40:44 2011 +0000
@@ -0,0 +1,1 @@
+1.0.170.0/24
diff -r fa727518fd73 -r 6134d4251b9f 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 03:40:44 2011 +0000
@@ -0,0 +1,1 @@
+harald
diff -r fa727518fd73 -r 6134d4251b9f db/usr/harald/git
--- a/db/usr/harald/git	Sun Feb 13 00:16:55 2011 +0000
+++ b/db/usr/harald/git	Tue Feb 15 03:40:44 2011 +0000
@@ -1,1 +1,1 @@
-git://1.0.169.1/ano2.git
+git://1.0.169.14/ano.git