Mark Haines 7c06399512 Merge branch 'develop' into request_logging ...

Conflicts:
	synapse/config/logger.py

2014-10-30 11:13:58 +00:00

..

__init__.py

Fix pep8 warnings

2014-10-30 11:10:17 +00:00

homeserver.py

Add a request-id to each log line

2014-10-30 01:21:33 +00:00