Merge branch 'master' into hvm

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py

...

This commit is contained in:

Marek Marczykowski 2012-03-06 02:21:52 +01:00

parent 811b597f2b 23e1e1db1f

commit 21543dbb4c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available