Matthew Hodgson 8376f0d75a Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat ... Wmwragg/one to one chat		2016-09-09 10:46:01 +01:00
..
vector	Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat	2016-09-09 10:46:01 +01:00