Auto merge of #1928 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 21 Aug 2015 19:00:53 +0000 (19:00 +0000)
committerbors <bors@rust-lang.org>
Fri, 21 Aug 2015 19:00:53 +0000 (19:00 +0000)
* Update dependencies that are getting warnings on nightly
* Tweak expected output of failing tests


Trivial merge