Daniel Gultsch 9d1a8c607f Merge branch 'development' of github.com:siacs/Conversations into development		2015-05-21 09:19:56 +02:00
..
siacs/conversations	Merge branch 'development' of github.com:siacs/Conversations into development	2015-05-21 09:19:56 +02:00