diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-01-13 22:16:46 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-01-13 22:16:46 -0500 |
| commit | 65931bb384aada922c5287a3ad3cc62d04d6e676 (patch) | |
| tree | 27297893f7cfa3be0dff1c4be5c81dbbfab6fcb0 /sleekxmpp/plugins | |
| parent | a5d53b3349dc1488da57a7b02758ab1063b4560c (diff) | |
| parent | 632827f213235ab33f08dc133cf50b2c9287cfd0 (diff) | |
| download | slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.gz slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.bz2 slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.tar.xz slixmpp-65931bb384aada922c5287a3ad3cc62d04d6e676.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp/plugins')
| -rw-r--r-- | sleekxmpp/plugins/old_0004.py | 2 |
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 |