From: Stefan Hajnoczi Date: Mon, 14 Nov 2016 15:35:57 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/fam/tags/for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=736986fad31cd0f25cec89138a566f6938935a29;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/fam/tags/for-upstream' into staging * remotes/fam/tags/for-upstream: test-uuid: fix leak Message-id: 20161111131818.GC12800@lemon Signed-off-by: Stefan Hajnoczi --- 736986fad31cd0f25cec89138a566f6938935a29