# HG changeset patch
# User icann <icann@icann.ano>
# Date 1346190421 0
# Node ID aaf2e414c17dfefaeef6a897a8373fef14315627
# Parent  8827368f49f0477fb29a85820be0bdbd46bd9ffd# Parent  2ce94cf23bd7b7a66cc850740ecd08b5e7991322
Merge branch 'master' of git://git1.srn.ano

diff -r 8827368f49f0 -r aaf2e414c17d db/udpmsg4/NNNC/Kinder_Surprise/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/Kinder_Surprise/@/.gitignore	Tue Aug 28 21:47:01 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 8827368f49f0 -r aaf2e414c17d db/udpmsg4/NNNC/Kinder_Surprise/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/Kinder_Surprise/@/default.key	Tue Aug 28 21:47:01 2012 +0000
@@ -0,0 +1,1 @@
+25e75a86beaa74a6c7ae702161a5d9e1c1c96b1e417568990b68b3e678b00f4e
diff -r 8827368f49f0 -r aaf2e414c17d db/udpmsg4/NNNC/Kinder_Surprise/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/Kinder_Surprise/@/owner	Tue Aug 28 21:47:01 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 8827368f49f0 -r aaf2e414c17d db/udpmsg4/NNNC/Kinder_Surprise/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NNNC/Kinder_Surprise/@/path	Tue Aug 28 21:47:01 2012 +0000
@@ -0,0 +1,1 @@
+/NNNC/Kinder_Surprise