Mark Haines 784aaa53df Merge branch 'develop' into markjh/SYT-8-recaptcha
Conflicts:
	synapse/handlers/auth.py
2015-05-29 13:49:44 +01:00
..
2015-04-17 13:51:10 +01:00
2015-01-06 13:21:39 +00:00
2015-05-22 14:45:46 +01:00