]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #20436 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:56:13 +0000 (21:56 +0000)
committerbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:56:13 +0000 (21:56 +0000)

Trivial merge