Merge branch 'kvm'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 2 Aug 2013 09:28:51 +0000 (11:28 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 2 Aug 2013 09:28:51 +0000 (11:28 +0200)
commit7644b0f216f24a1fc5f9b910c957030ee0b115fe
tree6ca950f0c323d9681d000496d1bdc30d0c4d2a61
parent95eb1ab3b70bc8e9f1f55e9f408ccda01cd6f112
parent17d2db9dcba7602fdffe2ab45dd8b5cbbe65a1aa
Merge branch 'kvm'

Conflicts:
stack/resilient/buildout.cfg
stack/resilient/buildout.cfg