Merge remote-tracking branch 'mozilla/incoming' into issue-5910-dyna-freeze

author Niko Matsakis <niko@alum.mit.edu>

Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)

committer Niko Matsakis <niko@alum.mit.edu>

Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)
author Niko Matsakis <niko@alum.mit.edu>
Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)
committer Niko Matsakis <niko@alum.mit.edu>
Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)
diff --cc src/librustc/metadata/encoder.rs
Simple merge
diff --cc src/libstd/std.rc
Simple merge
diff --cc src/libsyntax/ext/expand.rs
Simple merge
author	Niko Matsakis <niko@alum.mit.edu>
	Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)
committer	Niko Matsakis <niko@alum.mit.edu>
	Mon, 6 May 2013 20:10:31 +0000 (16:10 -0400)
		1	2
src/librustc/metadata/encoder.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/std.rc	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/ext/expand.rs	patch \|	diff1 \|	diff2 \|	blob \| history