Kegan Dougal f9232c7917 Merge branch 'develop' into application-services-txn-reliability
Conflicts:
	synapse/storage/appservice.py
2015-03-16 10:09:15 +00:00
..
2015-02-11 16:52:22 +00:00
2015-03-12 16:24:51 +00:00
2015-03-12 16:45:05 +00:00
2015-03-12 16:53:12 +00:00
2015-03-12 18:56:53 +00:00
2015-01-06 13:21:39 +00:00
2015-03-06 14:24:53 +00:00
2015-03-12 16:24:51 +00:00