auto merge of #2585 : ebalint/servo/2530, r=jdm

This commit is contained in:
bors-servo 2014-06-13 14:04:45 -04:00
commit c0576108c5
8 changed files with 455 additions and 418 deletions

View file

@ -8,7 +8,7 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::window::Window;
use servo_util::str::DOMString;
use script_task::{Page};
use page::Page;
use std::rc::Rc;
use serialize::{Encoder, Encodable};