]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-7' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 8 May 2014 09:57:25 +0000 (10:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 8 May 2014 09:57:25 +0000 (10:57 +0100)
spice: small fixes

# gpg: Signature made Thu 08 May 2014 09:50:21 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-7:
  spice: fix libvirt snapshots
  spice: fix "info spice"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge