From: bors <bors@rust-lang.org>
Date: Thu, 17 Nov 2016 20:45:11 +0000 (-0800)
Subject: Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~118
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7be4f2ef2cf743492edc6dfb55d087ed88f2d76;p=cargo.git

Auto merge of #3299 - alexcrichton:fix-tests, r=alexcrichton

Fix tests on nightly
---

b7be4f2ef2cf743492edc6dfb55d087ed88f2d76