summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-13 10:20:34 -0500
committerLance Stout <lancestout@gmail.com>2011-01-13 10:20:34 -0500
commitb71550cec7c85ceb4126daddbc39ed0d0e93b8d5 (patch)
tree5679328a80f993e23d06f3ec39733e8d69055776 /sleekxmpp/plugins
parentba0d699d831975eb4c0f9e5e441bba2972f91806 (diff)
parent7d93d1824be88c170a025d57afd3e54a06712d9d (diff)
downloadslixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.gz
slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.bz2
slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.tar.xz
slixmpp-b71550cec7c85ceb4126daddbc39ed0d0e93b8d5.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/old_0004.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/old_0004.py b/sleekxmpp/plugins/old_0004.py
index ade3d682..7f086866 100644
--- a/sleekxmpp/plugins/old_0004.py
+++ b/sleekxmpp/plugins/old_0004.py
@@ -6,7 +6,7 @@
See the file LICENSE for copying permission.
"""
from . import base
-import log
+import logging
from xml.etree import cElementTree as ET
import copy
import logging