]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16667 : retep998/rust/master, r=pcwalton
authorbors <bors@rust-lang.org>
Sat, 23 Aug 2014 01:40:48 +0000 (01:40 +0000)
committerbors <bors@rust-lang.org>
Sat, 23 Aug 2014 01:40:48 +0000 (01:40 +0000)
1  2 
src/librustrt/unwind.rs

Simple merge