Daniel Gultsch 4a1a59f0c8 Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps		2016-02-02 18:19:26 +01:00
..
eu/siacs/conversations	Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps	2016-02-02 18:19:26 +01:00