Auto merge of #4584 - alexcrichton:beta-next, r=matklad
authorbors <bors@rust-lang.org>
Fri, 6 Oct 2017 07:38:28 +0000 (07:38 +0000)
committerbors <bors@rust-lang.org>
Fri, 6 Oct 2017 07:38:28 +0000 (07:38 +0000)
[beta] Fix [patch] causing updates with a virtual manifest

This is a backport of https://github.com/rust-lang/cargo/pull/4583


Trivial merge