]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #47528 - GuillaumeGomez:rollup, r=GuillaumeGomez
authorbors <bors@rust-lang.org>
Thu, 18 Jan 2018 14:03:12 +0000 (14:03 +0000)
committerbors <bors@rust-lang.org>
Thu, 18 Jan 2018 14:03:12 +0000 (14:03 +0000)
Rollup of 6 pull requests

- Successful merges: #47250, #47313, #47398, #47468, #47471, #47520
- Failed merges:

1  2 
src/bootstrap/builder.rs
src/bootstrap/doc.rs

Simple merge
Simple merge