From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 15 Jan 2013 22:50:04 +0000 (-0600)
Subject: Merge remote-tracking branch 'mdroth/qga-pull-1-14-2013-2' into staging
X-Git-Tag: v1.4.0-rc0~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd3402d9242dec06bb1ca5680c1ddf421932b08;p=thirdparty%2Fqemu.git

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>
---

2fd3402d9242dec06bb1ca5680c1ddf421932b08