# HG changeset patch
# User epoch <epoch@hacking.allowed.org>
# Date 1369363187 0
# Node ID 5645d1ed79c525002b0a5b48ef1ad5c4abb6ae02
# Parent  c6666d29e9c698323f9957a7e99268b85e7fae01# Parent  98f2113fb0c12a3d929646966b41d8b0554a0bd5
There was some werid stuff with add_dom went with what looked like the best
of the conflicting lines.
Merge branch 'master' of git://1.4.7.7/resdb

Conflicts:
	scripts/add_dom

diff -r 98f2113fb0c1 -r 5645d1ed79c5 db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/cidr	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+fd63:1e39:6f73:2929::/64
diff -r 98f2113fb0c1 -r 5645d1ed79c5 db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/owner	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+epoch
diff -r 98f2113fb0c1 -r 5645d1ed79c5 scripts/add_dom
--- a/scripts/add_dom	Sat May 18 04:47:33 2013 +0000
+++ b/scripts/add_dom	Fri May 24 02:39:47 2013 +0000
@@ -4,7 +4,7 @@
  echo "Usage: $0 <dom> <owner> [<ns[/nsip]>...]" >&2; exit 255
 fi
 
-dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | head -c -1)"
+dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | ./scripts/head_-c_-1)"
 mkdir -p "$dir" || exit 1
 echo "$2" > "$dir/owner"
 mkdir "$dir/ns" || exit 1