Brian Anderson fc06114ddf Merge remote-tracking branch 'brson/companion' into incoming
Conflicts:
	src/compiletest/compiletest.rs
	src/libcargo/cargo.rs
	src/libcore/core.rs
	src/librustc/rustc.rs
	src/librustdoc/rustdoc.rc
2012-11-28 13:17:33 -08:00
..
2012-11-28 12:33:00 -08:00
2012-11-18 15:00:21 -08:00
2012-11-26 18:13:54 -08:00