]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #20360 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:01:42 +0000 (21:01 +0000)
committerbors <bors@rust-lang.org>
Wed, 31 Dec 2014 21:01:42 +0000 (21:01 +0000)

Trivial merge