Merge branch 'qmemman' of git://qubes-os.org/rafal/core

Conflicts:
	dom0/qvm-core/qubes.py
This commit is contained in:
Joanna Rutkowska 2010-09-23 12:31:25 +02:00
當前提交 2f92d0156b

沒有內容比較可以使用