| commit | 8494a397b68124f9898e7912173d460ee99ba3e2 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 31 Oct 2011 16:09:00 +0000 (31 11:09 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 31 Oct 2011 16:09:00 +0000 (31 11:09 -0500) | ||
| tree | 2c3ff12f56cb2587d00bab448a226d3cf0042d64 | treesnapshot (tar.gz zip) |
| parent | d439b79d730bf219e47c14ab94f1546bcc5045ab | commitdiff |
| parent | 336a6915bc7089fb20fea4ba99972ad9a97c5f52 | commitdiff |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Conflicts:
block/vmdk.c
Conflicts:
block/vmdk.c