Lance Stout a278f79bdb Merge branch 'develop' into roster ... Conflicts: sleekxmpp/clientxmpp.py		2011-02-14 16:18:44 -05:00
..
__init__.py
atom.py
error.py
htmlim.py
iq.py
message.py
nick.py
presence.py
rootstanza.py
roster.py	Merge branch 'develop' into roster	2011-02-14 16:18:44 -05:00
stream_error.py