Auto merge of #43319 - SimonSapin:cargoup, r=alexcrichton

bors · bors · commit 15aa15b03f41 · 2017-07-21T20:57:37.000Z
Update Cargo to ffab51954ec32d55631c37a8730bb24915fc090b rust-lang/cargo#4123 added the `[patch]` section of the manifest
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit f709c35a35687b2665eb290695825375be91410b
+Subproject commit ffab51954ec32d55631c37a8730bb24915fc090b
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
@@ -18,6 +18,7 @@ static LICENSES: &'static [&'static str] = &[
     "MIT/Apache-2.0",
     "MIT / Apache-2.0",
     "Apache-2.0/MIT",
+    "Apache-2.0 / MIT",
     "MIT OR Apache-2.0",
     "MIT",
     "Unlicense/MIT",
