Daniel Gultsch 75749d7c7b Merge branch 'develop' of https://github.com/cijo7/Conversations into cijo7-develop		2017-03-31 09:34:38 +02:00
..
eu/siacs/conversations	Merge branch 'develop' of https://github.com/cijo7/Conversations into cijo7-develop	2017-03-31 09:34:38 +02:00