Daniel Gultsch 777dd4b51e Merge branch 'master' into development		2015-08-23 17:29:46 +02:00
..
eu/siacs/conversations	Merge branch 'master' into development	2015-08-23 17:29:46 +02:00