Daniel Gultsch a8010e7133 Merge branch 'development' into feature/take_picture		2014-05-13 15:40:59 +02:00
..
siacs/conversations	Merge branch 'development' into feature/take_picture	2014-05-13 15:40:59 +02:00