Julien Duponchelle d8fb33dba2 Fix merge conflict

2015-06-03 18:58:17 +02:00

..

__init__.py

Fix merge conflict

2015-06-03 18:58:17 +02:00

qemu_error.py

Some spring cleaning.

2015-04-08 11:17:34 -06:00

qemu_vm.py

ACPI shutdown support for Qemu VMs.

2015-06-02 22:33:38 -06:00