David Baker c291a4d522 Merge branch 'develop' into pushers ... Conflicts: synapse/handlers/events.py synapse/server.py		2015-01-28 12:51:05 +00:00
..
client	Merge branch 'develop' into pushers	2015-01-28 12:51:05 +00:00
media	…
__init__.py	…