From: bors <bors@rust-lang.org>
Date: Mon, 8 Jan 2018 19:11:39 +0000 (+0000)
Subject: Auto merge of #4920 - wking:license-expression, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~53
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f60ece98c10aa3716d037524da4ee989e212fe19;p=cargo.git

Auto merge of #4920 - wking:license-expression, r=matklad

Cargo.toml: Replace '/' with 'OR' in 'license'

Catch up with our recommendations from 7dee65fe (#4898), which deprecated `/` in favor of vanilla SPDX license expressions.

I've gone with the disjunctive `OR`, because the README has:

> Cargo is primarily distributed under the terms of both the MIT license and the Apache License (Version 2.0).
---

f60ece98c10aa3716d037524da4ee989e212fe19