Merge branch 'develop' into stream_features

2011-04-11 14:23:47 -04:00
parent ae5ce17035 1d891858b6
commit ea8c40c7b6
2 changed files with 6 additions and 5 deletions
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -132,6 +132,7 @@ class Scheduler(object):
        if threaded:
            self.thread = threading.Thread(name='sheduler_process',
                                           target=self._process)
+            self.thread.daemon = True
            self.thread.start()
        else:
            self._process()