]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25854 - liigo:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 29 May 2015 11:46:08 +0000 (11:46 +0000)
committerbors <bors@rust-lang.org>
Fri, 29 May 2015 11:46:08 +0000 (11:46 +0000)

Trivial merge