From: bors <bors@rust-lang.org>
Date: Tue, 25 Aug 2015 16:08:03 +0000 (+0000)
Subject: Auto merge of #1933 - steveklabnik:gh1855, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~17^2~104
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=06b6704ea97c82eb966ba57a94a31abd1415f78f;p=cargo.git

Auto merge of #1933 - steveklabnik:gh1855, r=alexcrichton

Fixes #1855
---

06b6704ea97c82eb966ba57a94a31abd1415f78f