Alex Crichton 886c6f3534 rollup merge of #21258: aturon/stab-3-index
Conflicts:
	src/libcore/ops.rs
	src/librustc_typeck/astconv.rs
	src/libstd/io/mem.rs
	src/libsyntax/parse/lexer/mod.rs
2015-01-21 11:53:49 -08:00
..
2015-01-20 22:56:53 +09:00
2015-01-20 00:43:15 +02:00
2015-01-20 11:27:51 -08:00