Daniel Wagner-Hall e8cf77fa49 Merge branch 'develop' into refresh
Conflicts:
	synapse/rest/client/v1/login.py
2015-08-20 16:25:40 +01:00
..
2015-04-29 13:32:32 +01:00
2015-05-01 16:14:25 +01:00
2015-05-08 16:04:32 +01:00
2015-05-18 10:11:14 +01:00
2015-08-20 16:21:35 +01:00