• Merge remote-tracking branch 'origin/master' into HEAD 

    Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
    @brson
    brson committed Aug 29, 2013
    9624148