# HG changeset patch
# User root <root@ip-10-56-75-16.(none)>
# Date 1342994063 0
# Node ID dbfcb0dacc4fd11195c42c2f2792f81c26cb6282
# Parent  5f19787186498db21d54a016ef3dea3ab15bc101# Parent  e0ebe6d65ebe67ece4466ad315d7ccdaf3e60137
Merge branch 'master' of git://git.d3v11.ano

diff -r e0ebe6d65ebe -r dbfcb0dacc4f db/udpmsg4/freenode/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/.gitignore	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r e0ebe6d65ebe -r dbfcb0dacc4f db/udpmsg4/freenode/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/default.key	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+0ed9501bd78fb4e822e7332fbfeb0846c31c6fd737c6318338a854d36c834309
diff -r e0ebe6d65ebe -r dbfcb0dacc4f db/udpmsg4/freenode/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/owner	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r e0ebe6d65ebe -r dbfcb0dacc4f db/udpmsg4/freenode/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/path	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+/freenode
diff -r e0ebe6d65ebe -r dbfcb0dacc4f db/udpmsg4/irc2p/@/default.key
--- a/db/udpmsg4/irc2p/@/default.key	Sun Jul 22 21:55:43 2012 +0000
+++ b/db/udpmsg4/irc2p/@/default.key	Sun Jul 22 21:54:23 2012 +0000
@@ -1,1 +1,1 @@
-e1ea7bf9e2f28a73964ea9513775d04431cbb9b298fcfef6965e322bff107f36
+7938ecd1cd3ac04990bc250c2d7a2fe77f99f08c26da532de34548b5f3a82430