Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-25' into queue...
authorKevin Wolf <kwolf@redhat.com>
Wed, 25 Nov 2015 13:33:01 +0000 (14:33 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 25 Nov 2015 13:33:01 +0000 (14:33 +0100)
One block patch for qemu 2.5-rc2.

# gpg: Signature made Wed Nov 25 14:30:45 2015 CET using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-11-25:
  qemu-iotests: Add -nographic when starting QEMU in 119 and 120

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Trivial merge