Auto merge of #4766 - alexcrichton:bump, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 1 Dec 2017 03:06:16 +0000 (03:06 +0000)
committerbors <bors@rust-lang.org>
Fri, 1 Dec 2017 03:06:16 +0000 (03:06 +0000)
Bump to 0.25.0


Trivial merge