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

This commit is contained in:
Marek Marczykowski 2012-04-20 13:50:54 +02:00
commit 51583492af

View File

@ -1 +1 @@
2.0.17 2.0.18