MSC4270: Matrix Glossary#4270

turt2live wants to merge 2 commits intomainmatrix-org/matrix-spec-proposals:mainfrom

travis/msc/glossarymatrix-org/matrix-spec-proposals:travis/msc/glossaryCopy head branch name to clipboard