Merge branch 'stream_features' into develop

2011-08-03 18:35:01 -07:00
parent db92fa2330 afeb8a679a
commit 9591cd3a7e
46 changed files with 2256 additions and 231 deletions
--- a/sleekxmpp/plugins/base.py
+++ b/sleekxmpp/plugins/base.py
@@ -66,7 +66,8 @@ class base_plugin(object):
        """
        if config is None:
            config = {}
-        self.xep = 'base'
+        self.xep = None
+        self.rfc = None
        self.description = 'Base Plugin'
        self.xmpp = xmpp
        self.config = config