]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #22397 - Manishearth:rollup, r=huonw
authorbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:57:55 +0000 (05:57 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:57:55 +0000 (05:57 +0000)
None

1  2 
src/libstd/os.rs

Simple merge