Marek Marczykowski 3e90174910 Merge branch 'hvm-for-master' ... Conflicts: dom0/qvm-core/qubes.py dom0/qvm-tools/qvm-sync-clock version_dom0 vm-systemd/qubes-sysinit.sh		2012-10-17 21:41:03 +02:00
..
Makefile
qmemman_algo.py
qmemman_client.py
qmemman_server.py
qmemman.py	Merge branch 'hvm-for-master'	2012-10-17 21:41:03 +02:00
server.py