]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #18872 : hirschenberger/rust/master, r=thestinger
authorbors <bors@rust-lang.org>
Thu, 13 Nov 2014 08:17:09 +0000 (08:17 +0000)
committerbors <bors@rust-lang.org>
Thu, 13 Nov 2014 08:17:09 +0000 (08:17 +0000)
Discussed in #18587

1  2 
src/librustc/lint/builtin.rs

Simple merge