Files
slixmpp/sleekxmpp/xmlstream/stanzabase.py
Lance Stout 83a73ac9b7 Merge branch 'develop' into stream_features
Conflicts:
	sleekxmpp/clientxmpp.py
2011-05-31 11:05:54 -07:00

47 KiB