• Merge commit upstream/master into rustup-20140716 

    Conflicts:
	Makefile.in
    @metajack
    metajack committed Jul 23, 2014
    566d142