auto merge of #4889 : Ms2ger/servo/4747-base64, r=jdm

This commit is contained in:
bors-servo 2015-02-10 07:24:45 -07:00
commit 58b7186cea
4 changed files with 4 additions and 4 deletions

View file

@ -47,7 +47,7 @@ use js::rust::with_compartment;
use url::{Url, UrlParser};
use libc;
use serialize::base64::{FromBase64, ToBase64, STANDARD};
use rustc_serialize::base64::{FromBase64, ToBase64, STANDARD};
use std::cell::{Ref, RefMut};
use std::default::Default;
use std::ffi::CString;