• Merge branch 'master' of github.com:farodin91/servo 

    Conflicts:
	components/script/dom/filereader.rs
    @farodin91
    farodin91 committed Jul 22, 2015
    Loading status checks…
    80f2246