]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #6604 : bjz/rust/ptr-to-option, r=brson
authorbors <bors@rust-lang.org>
Tue, 21 May 2013 03:31:26 +0000 (20:31 -0700)
committerbors <bors@rust-lang.org>
Tue, 21 May 2013 03:31:26 +0000 (20:31 -0700)
1  2 
src/libcore/ptr.rs

Simple merge