]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #10643 : jorendorff/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Nov 2013 10:27:01 +0000 (02:27 -0800)
committerbors <bors@rust-lang.org>
Mon, 25 Nov 2013 10:27:01 +0000 (02:27 -0800)

Trivial merge