changeset 409:fac089efa5b4 draft

Merge branch 'master' of git://git1.somerandomnick.ano
author Ivo Smits <Ivo@UCIS.nl>
date Tue, 15 Feb 2011 02:30:11 +0100
parents e7f35d6f87b1 (current diff) 5393c823be88 (diff)
children 8e98fd637f25 6134d4251b9f
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 02:30:11 2011 +0100
@@ -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 02:30:11 2011 +0100
@@ -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 02:30:11 2011 +0100
@@ -0,0 +1,1 @@
+harald
--- 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