slixmpp/sleekxmpp
Lance Stout e2de82ac8d Merge branch 'develop' into stream_features
Conflicts:
	sleekxmpp/clientxmpp.py
2011-05-20 13:26:21 -04:00
..
plugins
stanza Merge branch 'develop' into stream_features 2011-05-20 13:26:21 -04:00
test
thirdparty
xmlstream Merge branch 'develop' into stream_features 2011-05-20 13:26:21 -04:00
__init__.py
basexmpp.py
clientxmpp.py Merge branch 'develop' into stream_features 2011-05-20 13:26:21 -04:00
componentxmpp.py
exceptions.py