Julien Duponchelle 5f6d1bfdd6 Merge branch 'master' into unstable ... Conflicts: tests/modules/test_manager.py		2015-04-28 10:46:59 +02:00
..
test_qemu_manager.py	Fix some tests on Windows	2015-04-27 23:12:13 +02:00
test_qemu_vm.py	Merge branch 'master' into unstable	2015-04-28 10:46:59 +02:00