From: bors <bors@rust-lang.org>
Date: Thu, 10 Dec 2015 06:38:06 +0000 (+0000)
Subject: Auto merge of #30293 - steveklabnik:fixes, r=brson
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=8eee0efd1f3f43e379abf7dfcb190bd60700eeca;p=rust.git

Auto merge of #30293 - steveklabnik:fixes, r=brson

I meant to double check the work in https://github.com/rust-lang/rust/issues/29429, but due to Mozlando, forgot. Here are two small fixes.

r? @brson I would like to get this backported to beta as well, sorry :( I don't generally want doc backports, but feel this is exceptional and worth it.
---

8eee0efd1f3f43e379abf7dfcb190bd60700eeca