David Baker 6532b6e607 Merge branch 'develop' into csauth
Conflicts:
	synapse/http/server.py
2015-04-24 09:37:54 +01:00
..
2015-04-17 13:51:10 +01:00
2015-01-06 13:21:39 +00:00
2015-04-01 14:05:24 +01:00
2015-04-08 14:10:06 +01:00
2015-04-17 16:46:45 +01:00
2015-04-17 16:46:45 +01:00
2015-04-17 16:46:45 +01:00