Merge remote-tracking branch 'qemu/master'
commitdf2e888839634635ee7247b19d3c549cbc4c0609
authorStefan Weil <sw@weilnetz.de>
Mon, 21 Jul 2014 16:32:16 +0000 (21 18:32 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 21 Jul 2014 16:32:16 +0000 (21 18:32 +0200)
treea6544fcf0cf4231785f007243e2887b0d89be2e8
parentc71c2047909d349b5a4ed6142d537aaed6e883ef
parent147fc419734b057b9d9154c2ca0d9d397054104b
Merge remote-tracking branch 'qemu/master'
qemu-doc.texi
qemu-img.c