Merge branch 'master' into hvm

Browse Source

Conflicts:
	dom0/qvm-core/qubes.py
	version_dom0
	version_vm

...

This commit is contained in:

Marek Marczykowski 2012-03-08 15:03:49 +01:00

parent c9cc8d6058 2b3939ab64

commit ba7822975d

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