]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'spice/spice.v42' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:07:57 +0000 (09:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:07:57 +0000 (09:07 -0500)

Trivial merge