]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12136 : alexcrichton/rust/issue-12123, r=brson
authorbors <bors@rust-lang.org>
Mon, 10 Feb 2014 05:56:26 +0000 (21:56 -0800)
committerbors <bors@rust-lang.org>
Mon, 10 Feb 2014 05:56:26 +0000 (21:56 -0800)
Closes #12123

1  2 
src/libnative/io/file.rs

Simple merge