Mark Haines a7122692d9 Merge branch 'release-v0.10.0' into develop
Conflicts:
	synapse/handlers/auth.py
	synapse/python_dependencies.py
	synapse/rest/client/v1/login.py
2015-08-28 11:15:27 +01:00
..
2015-05-14 16:54:35 +01:00
2015-08-04 15:58:28 +01:00
2015-08-20 16:21:35 +01:00
2015-08-24 17:18:58 +01:00
2015-08-18 11:54:03 +01:00