# HG changeset patch
# User icann <icann@icann.ano>
# Date 1345910755 0
# Node ID 8827368f49f0477fb29a85820be0bdbd46bd9ffd
# Parent  791f3cd6d58ea8ff9e118e47c4b59b1c223823c1# Parent  8335c3d9d578cce57929ca52ca4732ea267aed39
Merge branch 'master' of git://git1.srn.ano

diff -r 791f3cd6d58e -r 8827368f49f0 db/udpmsg4/NNNC/mama/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/mama/@/.gitignore	Sat Aug 25 16:05:55 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 791f3cd6d58e -r 8827368f49f0 db/udpmsg4/NNNC/mama/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/mama/@/default.key	Sat Aug 25 16:05:55 2012 +0000
@@ -0,0 +1,1 @@
+36382aa7fec14585a4c5c27bfbc09e6cc87f715872758d86dcded38cf26c7c25
diff -r 791f3cd6d58e -r 8827368f49f0 db/udpmsg4/NNNC/mama/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/mama/@/owner	Sat Aug 25 16:05:55 2012 +0000
@@ -0,0 +1,1 @@
+mama
diff -r 791f3cd6d58e -r 8827368f49f0 db/udpmsg4/NNNC/mama/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/mama/@/path	Sat Aug 25 16:05:55 2012 +0000
@@ -0,0 +1,1 @@
+/NNNC/mama