]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #31241 - tshepang:fix, r=steveklabnik
authorbors <bors@rust-lang.org>
Thu, 28 Jan 2016 11:00:55 +0000 (11:00 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 Jan 2016 11:00:55 +0000 (11:00 +0000)

Trivial merge