]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #17544 : eklitzke/master
authorAlex Crichton <alex@alexcrichton.com>
Mon, 29 Sep 2014 15:12:32 +0000 (08:12 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 29 Sep 2014 15:12:32 +0000 (08:12 -0700)
1  2 
configure

diff --cc configure
Simple merge