xen-ganeti/update
Merge branch 'master' of https://github.com/jonschipp/vagrant