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

This commit is contained in:
Lance Stout 2011-01-13 10:20:34 -05:00
commit b71550cec7
2 changed files with 2 additions and 2 deletions

View file

@ -46,7 +46,7 @@ packages = [ 'sleekxmpp',
'sleekxmpp/thirdparty',
'sleekxmpp/plugins',
'sleekxmpp/plugins/xep_0030',
'sleekxmpp/plugins/xep_0030/stanza'
'sleekxmpp/plugins/xep_0030/stanza',
'sleekxmpp/plugins/xep_0059',
'sleekxmpp/plugins/xep_0092',
]

View file

@ -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