Brian Anderson 5a6fb8eb98 Merge remote-tracking branch 'rust-lang/master' ... Conflicts: src/librustc/lint/builtin.rs src/librustc/lint/context.rs		2015-01-26 15:42:32 -08:00
..
lib.rs	Merge remote-tracking branch 'rust-lang/master'	2015-01-26 15:42:32 -08:00