]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7531 : sankha93/rust/master, r=bblum
authorbors <bors@rust-lang.org>
Wed, 3 Jul 2013 13:34:56 +0000 (06:34 -0700)
committerbors <bors@rust-lang.org>
Wed, 3 Jul 2013 13:34:56 +0000 (06:34 -0700)
This pull request fixes #7118.

1  2 
src/librustc/middle/resolve.rs

Simple merge