Daniel Gultsch 7bd0f31244 Merge branch 'master' into development		2015-08-23 17:57:53 +02:00
..
eu/siacs/conversations	Merge branch 'master' into development	2015-08-23 17:57:53 +02:00