]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e07fc40 3b8b030)
Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 16:07:08 +0000 (11:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 22 Jul 2011 16:07:08 +0000 (11:07 -0500)

Trivial merge
Qemu copy for testing