]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #18201 : Gankro/rust/option-what, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 21 Oct 2014 14:52:11 +0000 (14:52 +0000)
committerbors <bors@rust-lang.org>
Tue, 21 Oct 2014 14:52:11 +0000 (14:52 +0000)
:whale:

1  2 
src/libcore/option.rs

Simple merge