From: bors <bors@rust-lang.org>
Date: Tue, 25 Oct 2016 21:18:01 +0000 (-0700)
Subject: Auto merge of #3229 - martinhath:master, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ad47f0a092e3b79718b2e529f763f70421255513;p=cargo.git

Auto merge of #3229 - martinhath:master, r=alexcrichton

Add fix and test for #3224

This commit fixes #3224, and adds a test for it.
First time contributor to Cargo here, so I'm sorry if I put stuff the wrong places :)
---

ad47f0a092e3b79718b2e529f763f70421255513