]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8070 : luqmana/rust/nom, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 27 Jul 2013 15:58:33 +0000 (08:58 -0700)
committerbors <bors@rust-lang.org>
Sat, 27 Jul 2013 15:58:33 +0000 (08:58 -0700)
Fixes #5972.

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

Simple merge