# HG changeset patch
# User icann <icann@icann.ano>
# Date 1346514020 0
# Node ID c3bf76d62a4b3cb0848c85a8e12f17c81e473ac0
# Parent  8d428ae79e737bbdb0f996497526fd6f5ee3eb84# Parent  ec6c17c04a26b73c61de47d28622144aeed8cee2
Merge branch 'master' of git://git1.srn.ano

diff -r 8d428ae79e73 -r c3bf76d62a4b db/udpmsg4/NNNC/nick/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/nick/@/.gitignore	Sat Sep 01 15:40:20 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 8d428ae79e73 -r c3bf76d62a4b db/udpmsg4/NNNC/nick/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/nick/@/default.key	Sat Sep 01 15:40:20 2012 +0000
@@ -0,0 +1,1 @@
+9302d8aec06d14e8ce7484d0990ced8e279a9faabcfaf8566c93ef713abb5c04
diff -r 8d428ae79e73 -r c3bf76d62a4b db/udpmsg4/NNNC/nick/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/nick/@/owner	Sat Sep 01 15:40:20 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 8d428ae79e73 -r c3bf76d62a4b db/udpmsg4/NNNC/nick/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/nick/@/path	Sat Sep 01 15:40:20 2012 +0000
@@ -0,0 +1,1 @@
+/NNNC/nick