• Merge remote-tracking branch 'refs/remotes/upstream/master' into servo 

    Conflicts:
	.gitignore
	Makefile.in
	configure
	phf/src/lib.rs
    @metajack
    metajack committed Aug 5, 2014
    532af54