From: bors <bors@rust-lang.org>
Date: Thu, 9 Feb 2017 01:22:51 +0000 (+0000)
Subject: Auto merge of #3671 - z1mvader:master, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~9^2~161
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5679e21ef8c7deabce3911ce04ead338ff063be;p=cargo.git

Auto merge of #3671 - z1mvader:master, r=alexcrichton

trying to fix unimplemented flock under linux

It fixes https://github.com/rust-lang/cargo/issues/3666
---

c5679e21ef8c7deabce3911ce04ead338ff063be