From: bors <bors@rust-lang.org>
Date: Mon, 8 Jan 2018 16:37:05 +0000 (+0000)
Subject: Auto merge of #4916 - tari:doc-recovery, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~3^2~55
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=93bf2a3c9ab88984b72a612df6ff7c08a3e2f36e;p=cargo.git

Auto merge of #4916 - tari:doc-recovery, r=alexcrichton

Recover doc changes lost in #4904

Fixes #4906.
---

93bf2a3c9ab88984b72a612df6ff7c08a3e2f36e