]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #15949 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 24 Jul 2014 16:11:23 +0000 (16:11 +0000)
committerbors <bors@rust-lang.org>
Thu, 24 Jul 2014 16:11:23 +0000 (16:11 +0000)

Trivial merge