From: bors <bors@rust-lang.org>
Date: Tue, 8 Nov 2016 16:30:24 +0000 (-0800)
Subject: Auto merge of #3274 - alexcrichton:more-travis-again, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5b5684ebfdba63dba4738858472dda5080327056;p=cargo.git

Auto merge of #3274 - alexcrichton:more-travis-again, r=alexcrichton

More travis again

Landing this again hopefully with the doc fix
---

5b5684ebfdba63dba4738858472dda5080327056