Mark Haines a3bfef35fd Merge branch 'develop' into markjh/v2_sync_receipts
Conflicts:
	synapse/handlers/sync.py
2015-11-03 17:31:17 +00:00
..
2015-10-28 13:45:56 +00:00
2015-10-20 11:58:58 +01:00
2015-10-22 16:17:23 +01:00
2015-08-26 16:03:17 +01:00
2015-10-28 14:05:50 +00:00
2015-08-26 11:08:23 +01:00