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

dom0/qvm-tools/qvm-backup-restore

@@ -323,6 +323,12 @@ def main():
                 host_collection.pop(vm.qid)
             continue
 
+        try:
+            vm.create_appmenus(verbose=True)
+        except Exception as err:
+            print "ERROR during appmenu restore: {0}".format(err)
+            print "*** VM '{0}' will not have appmenus".format(vm.name)
+
     # ... then NetVMs...
     for vm in [ vm for vm in vms_to_restore if vm.is_netvm()]:
 

version_dom0

@@ -1 +1 @@
-1.6.23
+1.6.25

version_vm

@@ -1 +1 @@
-1.6.20
+1.6.25