Merge branch 'erikj/state_users_in_room' of github.com:matrix-org/synapse into erikj/timings

erikj/timings
Erik Johnston 2016-06-01 15:37:04 +01:00
commit f4407484aa

Diff Content Not Available