summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0054
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-01-16 22:33:05 -0800
committerLance Stout <lancestout@gmail.com>2013-01-16 22:33:05 -0800
commit01da222d67858ac82951a0a3b01670ea201abd9c (patch)
tree384c743f69b711c192b2f435be4f2dbe7cb116a8 /sleekxmpp/plugins/xep_0054
parent1dbfa29a1ebb9becb93911b33f026cc1a7a7faee (diff)
parent518eee05c224b00cf4622038290f5fb0c0d4e95b (diff)
downloadslixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.gz
slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.bz2
slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.tar.xz
slixmpp-01da222d67858ac82951a0a3b01670ea201abd9c.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0054')
-rw-r--r--sleekxmpp/plugins/xep_0054/vcard_temp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0054/vcard_temp.py b/sleekxmpp/plugins/xep_0054/vcard_temp.py
index 09acd454..97da8c7c 100644
--- a/sleekxmpp/plugins/xep_0054/vcard_temp.py
+++ b/sleekxmpp/plugins/xep_0054/vcard_temp.py
@@ -8,7 +8,7 @@
import logging
-from sleekxmpp import Iq
+from sleekxmpp import JID, Iq
from sleekxmpp.exceptions import XMPPError
from sleekxmpp.xmlstream import register_stanza_plugin
from sleekxmpp.xmlstream.handler import Callback