=== modified file 'mandos-ctl'
--- mandos-ctl	2012-06-23 00:58:49 +0000
+++ mandos-ctl	2012-11-14 21:03:24 +0000
@@ -199,14 +199,15 @@
     >>> string_to_delta("5m 30s")
     datetime.timedelta(0, 330)
     """
-    value = datetime.timedelta(0)
-    regexp = re.compile(r"(\d+)([dsmhw]?)")
     
     try:
         return rfc3339_duration_to_delta(interval)
     except ValueError:
         pass
     
+    value = datetime.timedelta(0)
+    regexp = re.compile(r"(\d+)([dsmhw]?)")
+    
     for num, suffix in regexp.findall(interval):
         if suffix == "d":
             value += datetime.timedelta(int(num))

=== modified file 'mandos-monitor'
--- mandos-monitor	2012-07-03 20:55:09 +0000
+++ mandos-monitor	2012-11-14 21:03:24 +0000
@@ -588,7 +588,7 @@
             if not mandos_clients:
                 self.log_message_raw(("bold", "Note: Server has no clients."))
         except dbus.exceptions.DBusException:
-            self.log_message_raw(("bold", "Note: No Mandos servers running."))
+            self.log_message_raw(("bold", "Note: No Mandos server running."))
             mandos_clients = dbus.Dictionary()
         
         (self.mandos_serv