Daniel Gultsch 625fbe7d81 Merge branch 'master' into development		2014-04-18 01:07:45 +02:00
..
eu/siacs/conversations	Merge branch 'master' into development	2014-04-18 01:07:45 +02:00