From: bors <bors@rust-lang.org>
Date: Wed, 21 Jun 2017 17:49:38 +0000 (+0000)
Subject: Auto merge of #4202 - dethoter:issue-4199, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~8^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af0edfe6ed9c0cd110cb7e47186543659bb0c2a5;p=cargo.git

Auto merge of #4202 - dethoter:issue-4199, r=alexcrichton

Fix an incorrect merge of credentials. Add a new test for that.

Fix for #4199.
---

af0edfe6ed9c0cd110cb7e47186543659bb0c2a5