slixmpp/sleekxmpp
Robert Robinson c2dc44cfd1 Merge branch 'develop' into xep_0050_updates
# Conflicts:
#	tests/test_stream_xep_0050.py
2015-09-18 13:35:28 -06:00
..
2013-08-10 21:34:18 +04:00
2015-04-11 20:38:11 -04:00