]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19250 : kmcallister/rust/atomicoption, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 24 Nov 2014 13:56:36 +0000 (13:56 +0000)
committerbors <bors@rust-lang.org>
Mon, 24 Nov 2014 13:56:36 +0000 (13:56 +0000)
Fixes #19247.


Trivial merge