# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1265515951 -3600
# Node ID cf54cc3373f239a167a52fe8e89ca1d6e163b6d9
# Parent  e33b90f96e0fb4eb7871e7603da98d232da9a729# Parent  7295e27e8c99f0f86f2d7ee0f9eae142227340a7
merging mergiing svn

diff -r e33b90f96e0f -r cf54cc3373f2 iro/MyIro_daemon
--- a/iro/MyIro_daemon	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/MyIro_daemon	Sun Feb 07 05:12:31 2010 +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 e33b90f96e0f -r cf54cc3373f2 iro/iro.py
--- a/iro/iro.py	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/iro.py	Sun Feb 07 05:12:31 2010 +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 e33b90f96e0f -r cf54cc3373f2 iro/merlin_daemon
--- a/iro/merlin_daemon	Sun Feb 07 05:10:46 2010 +0100
+++ b/iro/merlin_daemon	Sun Feb 07 05:12:31 2010 +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