]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #18575 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 3 Nov 2014 21:07:45 +0000 (21:07 +0000)
committerbors <bors@rust-lang.org>
Mon, 3 Nov 2014 21:07:45 +0000 (21:07 +0000)

Trivial merge