David Baker b56730bb6e Merge branch 'develop' into pushers
Conflicts:
	synapse/api/errors.py
	synapse/server.py
	synapse/storage/__init__.py
2014-12-18 15:15:22 +00:00
..
2014-12-18 15:15:22 +00:00
2014-11-07 10:53:38 +00:00
2014-12-16 13:17:09 +00:00
2014-09-24 15:27:59 +01:00
2014-09-29 14:59:52 +01:00