]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e54f177 52c0502)
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 7 Apr 2011 14:56:09 +0000 (09:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 7 Apr 2011 14:56:09 +0000 (09:56 -0500)

Trivial merge
Qemu copy for testing