]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #13525 : Ryman/rust/issue_5997, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 18 Apr 2014 04:21:24 +0000 (21:21 -0700)
committerbors <bors@rust-lang.org>
Fri, 18 Apr 2014 04:21:24 +0000 (21:21 -0700)
Closes #5997.


Trivial merge