Lance Stout de6170a13d Merge branch 'develop' into roster ...

Conflicts:
	sleekxmpp/basexmpp.py

2011-02-02 09:13:22 -05:00

..

__init__.py

SleekTest may now run against a live stream.

2010-10-07 19:43:51 -04:00

livesocket.py

Fixed some live stream test errors.

2010-11-17 15:45:16 -05:00

mocksocket.py

SleekTest may now run against a live stream.

2010-10-07 19:43:51 -04:00

sleektest.py

Merge branch 'develop' into roster

2011-02-02 09:13:22 -05:00