changeset 220:59b8096adeb3 draft

Merge branch 'master' of git://git1.somerandomnick.ano
author Ivo Smits <Ivo@UCIS.nl>
date Sun, 24 Oct 2010 10:30:07 +0200
parents 541a2fcacc4c (current diff) 99fc6f115252 (diff)
children f115c17c9e0e
files
diffstat 4 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /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
--- /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
--- /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
--- /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