# HG changeset patch
# User Ivo Smits <Ivo@UCIS.nl>
# Date 1294864205 -3600
# Node ID 2c4b617af4801cf62437c825624bb8c11b07b27c
# Parent  c35fdaa5fc484714e949f037e962579b8c190024# Parent  6e2661e2a72636e32dc68d9fe35457d062c7af3a
Merge branch 'master' of git://1.3.9.1

diff -r c35fdaa5fc48 -r 2c4b617af480 db/usr/lex/email
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lex/email	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+lex@lynx.ano
diff -r c35fdaa5fc48 -r 2c4b617af480 db/usr/lex/irc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lex/irc	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+irc://1.3.9.1/anonet
diff -r c35fdaa5fc48 -r 2c4b617af480 db/usr/lex/nntp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/usr/lex/nntp	Wed Jan 12 21:30:05 2011 +0100
@@ -0,0 +1,1 @@
+1.3.9.1