# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1346700830 -3600
# Node ID 73b7d30959af78e14974bf8e6a943f1483fde8b0
# Parent  115f429c175842e23ac597dbc3750cd43b968d30# Parent  0a4aed7dac429039f17590bc79e188f192c73018
Merge branch 'master' of git://1.56.75.16/resdb

diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/relayhell/nyx/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/.gitignore	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/relayhell/nyx/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/default.key	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+89b2093e7579c5568cc2301ad08efea743059ecb4e0b15b28fca9b1abdc41267
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/relayhell/nyx/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/owner	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+nyx
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/relayhell/nyx/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/path	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+/relayhell/nyx
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/spoofnet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/.gitignore	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+temp.keys
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/spoofnet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/default.key	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+274f2f5e8ce51d9837b7aa4495e60cd62883d8a131d4af71324d84a0e3820503
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/spoofnet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/owner	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 115f429c1758 -r 73b7d30959af db/udpmsg4/spoofnet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/spoofnet/@/path	Mon Sep 03 20:33:50 2012 +0100
@@ -0,0 +1,1 @@
+/spoofnet