]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #10225 : Jurily/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 2 Nov 2013 06:36:10 +0000 (23:36 -0700)
committerbors <bors@rust-lang.org>
Sat, 2 Nov 2013 06:36:10 +0000 (23:36 -0700)

Trivial merge