Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

2011-01-13 10:20:34 -05:00
parent ba0d699d83 7d93d1824b
commit b71550cec7
2 changed files with 2 additions and 2 deletions
--- 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