]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12286 : sfackler/rust/no-conditions, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 15 Feb 2014 11:56:27 +0000 (03:56 -0800)
committerbors <bors@rust-lang.org>
Sat, 15 Feb 2014 11:56:27 +0000 (03:56 -0800)

Trivial merge