tree d246371fcf04762ebfdd9b5f247889aaaef2bdfe
parent dd25f938203eac51ef2ec9f4a545645ff49bda70
parent 01b87f6d217ed05d5948562f74f5cf7b511a9c6c
author Anthony Liguori <aliguori@us.ibm.com> 1358290204 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1358290204 -0600

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>