Auto merge of #10291 - jfhumann:10211, r=emilio

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10291)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-01 01:57:20 +05:30
commit 524a004e77
15 changed files with 98 additions and 88 deletions

View file

@ -1746,6 +1746,7 @@ dependencies = [
"url 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
"uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
"webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
"websocket 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
"xml5ever 0.1.1 (git+https://github.com/Ygg01/xml5ever)",
]