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

Conflicts:
	sleekxmpp/basexmpp.py

2010-12-13 14:36:53 -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

2010-12-13 14:36:53 -05:00