Daniel Gultsch f57b669f83 Merge branch 'development' of https://github.com/strb/Conversations into strb-development		2014-04-12 10:22:18 +02:00
..
eu/siacs/conversations	Merge branch 'development' of https://github.com/strb/Conversations into strb-development	2014-04-12 10:22:18 +02:00