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-02-15 10:36:31 -08:00
2013-05-22 11:59:17 -07:00
2013-05-22 14:27:14 -07:00
2012-08-24 11:47:21 -07:00
2013-10-23 13:33:52 +04:00
2015-06-18 00:21:19 +05:30
2013-02-11 20:01:53 -08:00
2012-08-24 11:44:56 -07:00
2014-06-07 20:06:17 -07:00
2013-10-23 13:33:52 +04:00
2012-07-30 19:15:10 -07:00
2013-09-24 16:07:50 -07:00
2013-01-26 15:15:01 -08:00
2015-08-10 15:34:27 +03:00
2013-07-26 17:48:33 +02:00