Auto merge of #2434 - alexcrichton:bump, r=brson
authorbors <bors@rust-lang.org>
Thu, 3 Mar 2016 19:42:44 +0000 (19:42 +0000)
committerbors <bors@rust-lang.org>
Thu, 3 Mar 2016 19:42:44 +0000 (19:42 +0000)

Trivial merge