]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #20104 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 22 Dec 2014 00:12:47 +0000 (00:12 +0000)
committerbors <bors@rust-lang.org>
Mon, 22 Dec 2014 00:12:47 +0000 (00:12 +0000)

Trivial merge