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

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>