• Merge remote-tracking branch 'origin/master'

    Conflicts:
    	src/components/script/dom/bindings/element.rs
    	src/components/script/dom/bindings/node.rs
    	src/components/script/dom/bindings/utils.rs
    brson committed Aug 30, 2013
    4