MSC2848: Globally unique event IDs#2848

turt2live wants to merge 5 commits intoold_mastermatrix-org/matrix-spec-proposals:old_masterfrom

travis/msc/global-event-idsmatrix-org/matrix-spec-proposals:travis/msc/global-event-idsCopy head branch name to clipboard