# HG changeset patch
# User icann <icann@icann.ano>
# Date 1346403930 0
# Node ID be16db13a6daf94d370dcf75a5326299da17f3df
# Parent  0a759b6c7a583bbf0a3855159c1f5987b444ed24# Parent  bc68bf249ea4ada9b821f50f19268c23e8bfd1fa
Merge branch 'master' of git://git1.srn.ano

diff -r 0a759b6c7a58 -r be16db13a6da db/udpmsg4/darknetirc/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/darknetirc/@/.gitignore	Fri Aug 31 09:05:30 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 0a759b6c7a58 -r be16db13a6da db/udpmsg4/darknetirc/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/darknetirc/@/default.key	Fri Aug 31 09:05:30 2012 +0000
@@ -0,0 +1,1 @@
+0597f77828763e3cdfcea2a39a87db1296c17a7cfa1b63f127686935a058fe10
diff -r 0a759b6c7a58 -r be16db13a6da db/udpmsg4/darknetirc/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/darknetirc/@/owner	Fri Aug 31 09:05:30 2012 +0000
@@ -0,0 +1,1 @@
+harlock
diff -r 0a759b6c7a58 -r be16db13a6da db/udpmsg4/darknetirc/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/darknetirc/@/path	Fri Aug 31 09:05:30 2012 +0000
@@ -0,0 +1,1 @@
+/darknetirc