auto merge of #11817 : salemtalha/rust/master, r=brson

author bors <bors@rust-lang.org>

Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)

committer bors <bors@rust-lang.org>

Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)
author bors <bors@rust-lang.org>
Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)
committer bors <bors@rust-lang.org>
Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)
diff --cc src/librustc/middle/ty.rs
Simple merge
diff --cc src/librustpkg/package_source.rs
Simple merge
diff --cc src/libsyntax/parse/parser.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)
committer	bors <bors@rust-lang.org>
	Sun, 26 Jan 2014 23:26:30 +0000 (15:26 -0800)
		1	2
src/librustc/middle/ty.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustpkg/package_source.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/parse/parser.rs	patch \|	diff1 \|	diff2 \|	blob \| history