Merge branch 'develop' into stream_features

Conflicts: sleekxmpp/clientxmpp.py
2011-05-20 13:26:21 -04:00
parent f125c11a81 9f1648328f
commit e2de82ac8d
9 changed files with 146 additions and 13 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()