]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #9576 : FlaPer87/rust/issue/9125, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 1 Oct 2013 09:06:32 +0000 (02:06 -0700)
committerbors <bors@rust-lang.org>
Tue, 1 Oct 2013 09:06:32 +0000 (02:06 -0700)
Fixes #9125

1  2 
src/libstd/task/mod.rs

Simple merge