Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm

Conflicts:
	version_dom0

This commit is contained in:

Marek Marczykowski

2012-03-08 18:06:30 +01:00

parent 2b94ff10d3 77a1eed064

commit 59e9db28b9

1 changed files with 1 additions and 1 deletions

 @ -1 +1 @@
 .0.3
 .0.6