]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'mdroth/qga-pull-1-14-2013-2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:50:04 +0000 (16:50 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:50:04 +0000 (16:50 -0600)
commit2fd3402d9242dec06bb1ca5680c1ddf421932b08
treed246371fcf04762ebfdd9b5f247889aaaef2bdfe
parentdd25f938203eac51ef2ec9f4a545645ff49bda70
parent01b87f6d217ed05d5948562f74f5cf7b511a9c6c
Merge remote-tracking branch 'mdroth/qga-pull-1-14-2013-2' into staging

* mdroth/qga-pull-1-14-2013-2:
  qga: add missing commas in json docs

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>