Lance Stout 484efff156 Merge branch 'develop' into roster ... Conflicts: setup.py sleekxmpp/clientxmpp.py		2011-08-12 16:47:58 -07:00
..
__init__.py
livesocket.py	Added support for testind disconnect errors.	2011-05-27 11:01:30 -07:00
mocksocket.py	Added support for testind disconnect errors.	2011-05-27 11:01:30 -07:00
sleektest.py	Merge branch 'develop' into roster	2011-08-12 16:47:58 -07:00