# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1259280891 -3600
# Node ID 7295e27e8c99f0f86f2d7ee0f9eae142227340a7
# Parent  2119564de7a9bed9921dc59a13966a0df5c91778# Parent  0180b538ed744d169bbb4d98c31ec8d6adf179e1
merging svn

diff -r 0180b538ed74 -r 7295e27e8c99 iro/MyIro_daemon
--- a/iro/MyIro_daemon	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/MyIro_daemon	Fri Nov 27 01:14:51 2009 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 NAME="IRO"
-DEAMON=/home/sandy/svn/daemon/MyIro
+DEAMON=/home/sandy/svn/iro/MyIro
 DEAMON_OPTS=""
 PID=/home/sandy/var/run/$NAME.pid
 
diff -r 0180b538ed74 -r 7295e27e8c99 iro/iro.py
--- a/iro/iro.py	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/iro.py	Fri Nov 27 01:14:51 2009 +0100
@@ -118,8 +118,8 @@
     provider=manager.Providerlist()
     provider.add("sipgate", sip, ["sms", "fax", ])
     provider.add("smstrade", smstrade, ["sms", ])
-    provider.add("geonet", None, ["sms", "fax", ])
-    provider.add("fax.de", None, ["sms", "fax", ])
+    #provider.add("geonet", None, ["sms", "fax", ])
+    #provider.add("fax.de", None, ["sms", "fax", ])
     provider.add("localhost", localhost, ["mail", ])
     provider.setDefault("sms","smstrade")
     provider.setDefault("fax","sipgate")
diff -r 0180b538ed74 -r 7295e27e8c99 iro/merlin_daemon
--- a/iro/merlin_daemon	Fri Nov 27 01:09:34 2009 +0100
+++ b/iro/merlin_daemon	Fri Nov 27 01:14:51 2009 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 NAME="merlin"
-DEAMON=/home/sandy/svn/daemon/$NAME
+DEAMON=/home/sandy/svn/iro/$NAME
 DEAMON_OPTS="/home/sandy/svn/iro/MyIro_daemon"
 PID=/home/sandy/var/run/$NAME.pid