Brian Anderson d179ba3b8e Merge remote-tracking branch 'rust-lang/master'
Conflicts:
	src/libcore/cmp.rs
	src/libcore/fmt/mod.rs
	src/libcore/iter.rs
	src/libcore/marker.rs
	src/libcore/num/f32.rs
	src/libcore/num/f64.rs
	src/libcore/result.rs
	src/libcore/str/mod.rs
	src/librustc/lint/builtin.rs
	src/librustc/lint/context.rs
	src/libstd/sync/mpsc/mod.rs
	src/libstd/sync/poison.rs
2015-01-25 22:14:06 -08:00
..
2015-01-23 21:04:10 -08:00
2014-12-16 17:08:49 +01:00
2015-01-08 17:03:40 -08:00
2015-01-03 09:49:51 +01:00
2015-01-23 21:13:35 -08:00
2015-01-12 10:09:47 +02:00