]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #30264 - GuillaumeGomez:patch-5, r=Manishearth
authorbors <bors@rust-lang.org>
Sat, 2 Jan 2016 16:56:15 +0000 (16:56 +0000)
committerbors <bors@rust-lang.org>
Sat, 2 Jan 2016 16:56:15 +0000 (16:56 +0000)
r? @Manishearth

Also: should I merged both commits? Not sure if it's really useful to keep the first one.

1  2 
src/librustc/diagnostics.rs

Simple merge