Auto merge of #4896 - alexcrichton:bump, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 4 Jan 2018 16:00:48 +0000 (16:00 +0000)
committerbors <bors@rust-lang.org>
Thu, 4 Jan 2018 16:00:48 +0000 (16:00 +0000)
Bump to 0.26.0


Trivial merge