diff options
| author | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
| commit | a189cb8333d5f59caa9015f0ded222696987d957 (patch) | |
| tree | 467f202bc7f85a4cde85a5add3c372515f18adc3 /sleekxmpp/stanza/__init__.py | |
| parent | 0d4825d3ea0562f305939e653e3d414e70e4aaa8 (diff) | |
| parent | 156b3200e3b5ad1b2e64eecc48cdc792f7b2ffd9 (diff) | |
| download | slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.gz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.bz2 slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.xz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/stanza/__init__.py')
| -rw-r--r-- | sleekxmpp/stanza/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/__init__.py b/sleekxmpp/stanza/__init__.py index dbf7b86f..4bd37dc5 100644 --- a/sleekxmpp/stanza/__init__.py +++ b/sleekxmpp/stanza/__init__.py @@ -8,7 +8,8 @@ from sleekxmpp.stanza.error import Error -from sleekxmpp.stanza.stream_error import StreamError from sleekxmpp.stanza.iq import Iq from sleekxmpp.stanza.message import Message from sleekxmpp.stanza.presence import Presence +from sleekxmpp.stanza.stream_features import StreamFeatures +from sleekxmpp.stanza.stream_error import StreamError |