]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12030 : eddyb/rust/kill-at-self-and-trait, r=cmr
authorbors <bors@rust-lang.org>
Thu, 6 Feb 2014 22:51:30 +0000 (14:51 -0800)
committerbors <bors@rust-lang.org>
Thu, 6 Feb 2014 22:51:30 +0000 (14:51 -0800)

Trivial merge