Antoine Legrand 26e3142c95 Merge branch 'master' into standalone_kubelet		2016-12-13 17:26:21 +01:00
..
tasks	Merge branch 'master' into standalone_kubelet	2016-12-13 17:26:21 +01:00