]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #17548 : cgaebel/master
authorAlex Crichton <alex@alexcrichton.com>
Mon, 29 Sep 2014 15:12:14 +0000 (08:12 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 29 Sep 2014 15:12:14 +0000 (08:12 -0700)
1  2 
src/libstd/io/mod.rs

Simple merge