]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #24970 - Hech:master, r=steveklabnik
authorbors <bors@rust-lang.org>
Thu, 30 Apr 2015 07:12:25 +0000 (07:12 +0000)
committerbors <bors@rust-lang.org>
Thu, 30 Apr 2015 07:12:25 +0000 (07:12 +0000)

Trivial merge