diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-24 20:01:18 -0700 |
| commit | c42f1ad4c79863261977a9c5ea3b33be0b51b946 (patch) | |
| tree | 8eee86ddb082f51dea0866f16146bcd1f4f13c1f /sleekxmpp/xmlstream/__init__.py | |
| parent | a3ec1af2053bc0be4864ae290e6e5fc39f3fd5fe (diff) | |
| parent | 9d8de7fc15afc39a666d2ac16b62a068dfc55112 (diff) | |
| download | slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.gz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.bz2 slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.tar.xz slixmpp-c42f1ad4c79863261977a9c5ea3b33be0b51b946.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/__init__.py')
| -rw-r--r-- | sleekxmpp/xmlstream/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/__init__.py b/sleekxmpp/xmlstream/__init__.py index 67b20c56..5a1ea1be 100644 --- a/sleekxmpp/xmlstream/__init__.py +++ b/sleekxmpp/xmlstream/__init__.py @@ -6,7 +6,7 @@ See the file LICENSE for copying permission. """ -from sleekxmpp.xmlstream.jid import JID +from sleekxmpp.jid import JID from sleekxmpp.xmlstream.scheduler import Scheduler from sleekxmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET from sleekxmpp.xmlstream.stanzabase import register_stanza_plugin |