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
..
2010-10-07 19:42:28 -04:00
2013-07-26 13:02:26 +02:00
2013-07-26 13:02:26 +02:00
2011-08-25 00:21:53 -07:00
2013-07-26 13:02:26 +02:00