]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #6586 : bjz/rust/formatting-and-conditionals, r=thestinger
authorbors <bors@rust-lang.org>
Sat, 18 May 2013 07:34:24 +0000 (00:34 -0700)
committerbors <bors@rust-lang.org>
Sat, 18 May 2013 07:34:24 +0000 (00:34 -0700)

Trivial merge