Auto merge of #2639 - SimonSapin:url-1.0, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 3 May 2016 22:11:27 +0000 (15:11 -0700)
committerbors <bors@rust-lang.org>
Tue, 3 May 2016 22:11:27 +0000 (15:11 -0700)
Update to rust-url 1.x

This is ready to go now :)


Trivial merge