Merge branch 'kvm' slapos-0.74
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 22 Mar 2012 11:13:26 +0000 (12:13 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 22 Mar 2012 11:13:26 +0000 (12:13 +0100)
commit4825a4a2519a9d730e8ce2c821a84f4904781128
tree020f8dd7f68cc540bed5b8229310ac220fc30621
parente9fbe54a77fa2ecfcab2182d6c7050c51a2788a1
parent0abe22958ad9d2ce2150c2c92205ad38c41a0f87
Merge branch 'kvm'