David Baker 5c6189ea3e Merge branch 'develop' into pushers ...

Conflicts:
	synapse/rest/__init__.py

2015-01-22 17:46:16 +00:00

..

__init__.py

Update copyright notices

2015-01-06 13:21:39 +00:00

homeserver.py

Merge branch 'develop' into pushers

2015-01-22 17:46:16 +00:00

synctl.py

Update copyright notices

2015-01-06 13:21:39 +00:00