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

2012-06-23 20:14:20 +02:00 · 2012-06-23 20:14:20 +02:00 · 55ad480a14
commit 55ad480a14
parent be7c079705 ceb3feccd8
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.25
+2.0.29
--- a/2
+++ b/2
@ -1 +1 @@
-1.7.19
+2.0.28