Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm

Conflicts:
	version_dom0
	version_vm
This commit is contained in:
Joanna Rutkowska 2012-03-02 02:24:37 +01:00
commit 10ad03b4a4

Diff Content Not Available