Merge remote-tracking branch 'qemu/master'
commit97465a998dc89b4fd13dbbf6c4a2ed71568b029e
authorStefan Weil <sw@weilnetz.de>
Wed, 16 Dec 2015 16:46:14 +0000 (16 17:46 +0100)
committerStefan Weil <sw@weilnetz.de>
Wed, 16 Dec 2015 16:46:14 +0000 (16 17:46 +0100)
treee7a0e8065bea24fc1e2d09a789079f4887e87aaf
parentd52fc74055807dc128ac4a80df1cedf12dd67be9
parenta8c40fa2d667e585382080db36ac44e216b37a1c
Merge remote-tracking branch 'qemu/master'