]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12848 : alexcrichton/rust/rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 12 Mar 2014 22:07:06 +0000 (15:07 -0700)
committerbors <bors@rust-lang.org>
Wed, 12 Mar 2014 22:07:06 +0000 (15:07 -0700)

Trivial merge