Milos Kozak 21ae42d37b Merge branch 'dev' into queue		2017-11-20 17:50:49 +01:00
..
androidaps	Merge branch 'dev' into queue	2017-11-20 17:50:49 +01:00
utils	Merge branch 'dev' into dev2	2017-11-20 17:28:15 +01:00