Merge remote-tracking branch 'upstream/master' into alt-registry-publish
authorChris Swindle <christopher.swindle@metaswitch.com>
Wed, 25 Oct 2017 20:21:24 +0000 (21:21 +0100)
committerChris Swindle <christopher.swindle@metaswitch.com>
Wed, 25 Oct 2017 20:21:24 +0000 (21:21 +0100)
commit77ca3777b4b64d99b46b77e9124194bd83ac000e
tree6824f84e112acbadeb87c557432bd07dd19dae1c
parent4f089431591ca1afd678feddc6df400de6c4d93b
parente3b0cf63a357d099a42a2aba91f38745ce6c0acd
Merge remote-tracking branch 'upstream/master' into alt-registry-publish

Conflicts:
src/cargo/util/toml/mod.rs
src/cargo/ops/registry.rs
src/cargo/util/toml/mod.rs
tests/publish.rs