]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8116 : toddaaro/rust/tls-tk-pr-pre, r=brson
authorbors <bors@rust-lang.org>
Fri, 2 Aug 2013 01:01:42 +0000 (18:01 -0700)
committerbors <bors@rust-lang.org>
Fri, 2 Aug 2013 01:01:42 +0000 (18:01 -0700)
Merged with task killing code this time around.


Trivial merge