Mark Haines 47374a33fc Merge remote-tracking branch 'origin/develop' into markjh/3pid		2016-01-29 14:15:12 +00:00
..
__init__.py
_base.py
account_data.py
admin.py
appservice.py
auth.py
directory.py
events.py
federation.py
identity.py
message.py
presence.py
profile.py
receipts.py
register.py
room.py
search.py
sync.py
typing.py