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-08-26 13:42:45 +01:00
2015-08-18 11:19:08 +01:00
2015-08-13 16:58:10 +01:00
2015-08-26 13:42:45 +01:00
2015-08-25 16:37:37 +01:00
2015-08-26 11:08:23 +01:00