Merge branch 'master' into hvm

Conflicts:
	dom0/qvm-tools/qvm-create
	version_dom0
This commit is contained in:
Marek Marczykowski 2012-08-23 11:11:59 +02:00
commit 08c75542f8

View File

@ -1 +1 @@
1.7.42
1.7.43