# HG changeset patch
# User gain <gain@notaplace.ano>
# Date 1324328604 25200
# Node ID 1f04a2c3e60199a4480bb9308b83fef8c2721e5f
# Parent  1d480a9c7efb917182f4077f5708b020f71223ed# Parent  06d89b3c665f8ee72c82851e4e35d4ef196217e4
Merge branch 'master' of git://git1.somerandomnick.ano/

diff -r 06d89b3c665f -r 1f04a2c3e601 db/as/32856/owner
--- /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
diff -r 06d89b3c665f -r 1f04a2c3e601 db/ip/01/80/58/cidr
--- /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
diff -r 06d89b3c665f -r 1f04a2c3e601 db/ip/01/80/58/owner
--- /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
diff -r 06d89b3c665f -r 1f04a2c3e601 db/usr/gain/git
--- /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