]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #10822 : ezyang/rust/master, r=huonw
authorbors <bors@rust-lang.org>
Tue, 10 Dec 2013 11:16:37 +0000 (03:16 -0800)
committerbors <bors@rust-lang.org>
Tue, 10 Dec 2013 11:16:37 +0000 (03:16 -0800)
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>

Trivial merge