From: Anthony Liguori 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-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fd3402d9242dec06bb1ca5680c1ddf421932b08;p=qemu.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 --- 2fd3402d9242dec06bb1ca5680c1ddf421932b08