Merge remote-tracking branch 'qemu/master'
commitc01363d3b12d6dabbaa6def4a930ba25278079f4
authorStefan Weil <sw@weilnetz.de>
Thu, 14 Apr 2016 17:47:59 +0000 (14 19:47 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 14 Apr 2016 17:47:59 +0000 (14 19:47 +0200)
tree4aa6b626ef1b3e11688eeba0f96d809158d8f5fd
parentb814b701f71beed3edf6ecf34fe210371dc637c1
parentbc8995cafa0c36b9e4be682e9a60d59484b33500
Merge remote-tracking branch 'qemu/master'