Julien Duponchelle ca4d09ea40 Merge branch 'master' into 2.0		2016-07-05 15:41:53 +02:00
..
test_docker_vm.py	Merge branch 'master' into 2.0	2016-07-05 15:41:53 +02:00
test_docker.py	Merge branch '1.5' into 2.0	2016-05-02 17:08:15 +02:00