Merge remote-tracking branch 'qemu/master'
commite75113e03359ad0b6d00775bc49ea5c96ccd751e
authorStefan Weil <sw@weilnetz.de>
Sun, 17 Jul 2016 18:40:06 +0000 (17 20:40 +0200)
committerStefan Weil <sw@weilnetz.de>
Sun, 17 Jul 2016 18:40:06 +0000 (17 20:40 +0200)
tree6752248ef2b43ce25ec06dbb52ae6ee2f70a1b13
parent8a0d96141f71f583f29ae75cd1b89a9fbbce245c
parent6b92bbfe812746fe7841a24c24e6460f5359ce72
Merge remote-tracking branch 'qemu/master'