]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19342 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 27 Nov 2014 04:32:12 +0000 (04:32 +0000)
committerbors <bors@rust-lang.org>
Thu, 27 Nov 2014 04:32:12 +0000 (04:32 +0000)

Trivial merge