changeset 413:6134d4251b9f draft

Merge branch 'master' of git://1.33.92.1
author pragmo <me@pragmo.ano>
date Tue, 15 Feb 2011 03:40:44 +0000
parents fa727518fd73 (current diff) fac089efa5b4 (diff)
children 374a14c13643
files
diffstat 4 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /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
--- /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
--- /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
--- 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