Lance Stout 566ec8a5f9 Merge branch 'develop' into stream_features ... Conflicts: sleekxmpp/xmlstream/stanzabase.py		2011-03-18 17:39:43 -04:00
..
handler
matcher
tostring
__init__.py
filesocket.py
jid.py
scheduler.py
stanzabase.py	Merge branch 'develop' into stream_features	2011-03-18 17:39:43 -04:00
test.py
test.xml
testclient.py
xmlstream.py