Merge branch 'develop' into roster

Conflicts: sleekxmpp/basexmpp.py
2010-12-13 14:36:53 -05:00
parent 12b61365ad f4451fe6b7
commit c16913c999
19 changed files with 1951 additions and 450 deletions
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -111,6 +111,9 @@ class BaseXMPP(XMLStream):
        self.boundjid = JID(jid)

        self.plugin = {}
+        self.plugin_config = {}
+        self.plugin_whitelist = []
+
        self.roster = roster.Roster(self)
        self.roster.add(self.boundjid.bare)