Lance Stout 484efff156 Merge branch 'develop' into roster ... Conflicts: setup.py sleekxmpp/clientxmpp.py		2011-08-12 16:47:58 -07:00
..
__init__.py
atom.py
error.py
htmlim.py
iq.py
message.py
nick.py
presence.py
rootstanza.py
roster.py
stream_error.py
stream_features.py