Merge pull request #248 from matrix-org/deviceid

synapse/api/auth.py

synapse/handlers/admin.py

synapse/handlers/message.py

synapse/handlers/sync.py

synapse/rest/client/v1/admin.py

synapse/rest/client/v1/directory.py

synapse/rest/client/v1/events.py

synapse/rest/client/v1/initial_sync.py

synapse/rest/client/v1/presence.py

synapse/rest/client/v1/profile.py

synapse/rest/client/v1/pusher.py

synapse/rest/client/v1/room.py

synapse/rest/client/v1/voip.py

synapse/rest/client/v2_alpha/account.py

synapse/rest/client/v2_alpha/filter.py

synapse/rest/client/v2_alpha/keys.py

synapse/rest/client/v2_alpha/receipts.py

synapse/rest/client/v2_alpha/sync.py

synapse/rest/media/v0/content_repository.py

synapse/rest/media/v1/upload_resource.py