Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

2011-08-12 16:36:03 -07:00
parent 88184ff955 9b7ed73f95
commit 8f1d0e7a79
24 changed files with 894 additions and 516 deletions
--- a/sleekxmpp/stanza/stream_features.py
+++ b/sleekxmpp/stanza/stream_features.py
@@ -19,6 +19,8 @@ class StreamFeatures(StanzaBase):
    namespace = 'http://etherx.jabber.org/streams'
    interfaces = set(('features', 'required', 'optional'))
    sub_interfaces = interfaces
+    plugin_tag_map = {}
+    plugin_attrib_map = {}

    def setup(self, xml):
        StanzaBase.setup(self, xml)