# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1326352454 0
# Node ID 11e3ffa2a1e1c582ec7a6e653a75112911c91121
# Parent  2d5ebcdf33030d3add141a94b03434d4d1fb3d49# Parent  6423b589fd242c7b0c3589ccabd3f51bcd321b5a
Merge branch 'master' of git://git.madnet.ano

diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/udpmsg4/MadNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/MadNet/@/.gitignore	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/udpmsg4/MadNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/MadNet/@/default.key	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+702d0186236e2278fc66e768694bab20681d808a8502d21e6b737f34b9128e4e
diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/udpmsg4/MadNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/MadNet/@/owner	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+MadHat
diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/udpmsg4/MadNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/MadNet/@/path	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+/MadNet
diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/usr/MadHat/email
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/MadHat/email	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+madhat@madnet.ano
diff -r 2d5ebcdf3303 -r 11e3ffa2a1e1 db/usr/MadHat/git
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/MadHat/git	Thu Jan 12 07:14:14 2012 +0000
@@ -0,0 +1,1 @@
+git://git.madnet.ano/