Merge branch 'master' into hvm

Conflicts:
	dom0/init.d/qubes_core
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs
	version_dom0
	version_vm
This commit is contained in:
Marek Marczykowski 2012-06-26 03:49:10 +02:00
commit d6776909b0

View File

@ -1 +1 @@
2.0.28
1.7.30