]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12095 : FlaPer87/rust/issue-11709, r=nikomatsakis
authorbors <bors@rust-lang.org>
Mon, 10 Feb 2014 20:56:40 +0000 (12:56 -0800)
committerbors <bors@rust-lang.org>
Mon, 10 Feb 2014 20:56:40 +0000 (12:56 -0800)
Closes #11709

1  2 
src/librustc/middle/trans/base.rs
src/librustc/middle/trans/controlflow.rs

Simple merge