]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Mon, 12 Dec 2011 00:12:31 +0000 (04:12 +0400)
committermalc <av1474@comtv.ru>
Mon, 12 Dec 2011 00:12:31 +0000 (04:12 +0400)

Trivial merge