]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:18:06 +0000 (10:18 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 14 May 2012 15:18:06 +0000 (10:18 -0500)
* qmp/queue/qmp:
  qapi: QMP input visitor, handle floats parsed as ints


Trivial merge