changeset 841:1f04a2c3e601 draft

Merge branch 'master' of git://git1.somerandomnick.ano/
author gain <gain@notaplace.ano>
date Mon, 19 Dec 2011 14:03:24 -0700
parents 1d480a9c7efb (diff) 06d89b3c665f (current diff)
children 038435e8c364
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/32856/owner	Mon Dec 19 14:03:24 2011 -0700
@@ -0,0 +1,1 @@
+gain
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/80/58/cidr	Mon Dec 19 14:03:24 2011 -0700
@@ -0,0 +1,1 @@
+1.128.88.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/80/58/owner	Mon Dec 19 14:03:24 2011 -0700
@@ -0,0 +1,1 @@
+gain
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/gain/git	Mon Dec 19 14:03:24 2011 -0700
@@ -0,0 +1,1 @@
+git://1.128.88.2/resdb