Conflicts: hack/Vagrantfile Resolved by: Daniel Mizyrycki <daniel@dotcloud.com> Upstream-commit: e3dbe2f2ba56c2dc482f8fbdd0db0556bbc253c9 Component: engine
Conflicts: hack/Vagrantfile Resolved by: Daniel Mizyrycki <daniel@dotcloud.com> Upstream-commit: e3dbe2f2ba56c2dc482f8fbdd0db0556bbc253c9 Component: engine