# HG changeset patch
# User root <root@ip-10-56-75-16.(none)>
# Date 1342925617 0
# Node ID 1a7aebf6d8dddfce57bc10363b9773210d948e98
# Parent  685205d9ec7a4f9a37bd75c1a480c6c8f68bdeed# Parent  d2aa32647e466ad774c540fa1ce1454a50ea3326
Merge branch 'master' of git://git1.srn.ano

diff -r 685205d9ec7a -r 1a7aebf6d8dd db/udpmsg4/freenode/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/.gitignore	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 685205d9ec7a -r 1a7aebf6d8dd db/udpmsg4/freenode/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/default.key	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+0ed9501bd78fb4e822e7332fbfeb0846c31c6fd737c6318338a854d36c834309
diff -r 685205d9ec7a -r 1a7aebf6d8dd db/udpmsg4/freenode/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/owner	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 685205d9ec7a -r 1a7aebf6d8dd db/udpmsg4/freenode/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/freenode/@/path	Sun Jul 22 02:53:37 2012 +0000
@@ -0,0 +1,1 @@
+/freenode
diff -r 685205d9ec7a -r 1a7aebf6d8dd db/udpmsg4/irc2p/@/default.key
--- a/db/udpmsg4/irc2p/@/default.key	Mon Jun 25 18:27:28 2012 +0000
+++ b/db/udpmsg4/irc2p/@/default.key	Sun Jul 22 02:53:37 2012 +0000
@@ -1,1 +1,1 @@
-e1ea7bf9e2f28a73964ea9513775d04431cbb9b298fcfef6965e322bff107f36
+7938ecd1cd3ac04990bc250c2d7a2fe77f99f08c26da532de34548b5f3a82430