]> git.lizzy.rs Git - rust.git/commit
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)
commit5890fcf87295d5b7a8f4ffa8d9918f755f72baf8
tree6bdd10dda4a962843c3dce5dee33e509152e95cb
parentd346f1a40e0d0ebe24e60d418f304641fc26f9b0
parentce761f4980e6cdc6115608e6db551bdf1c49387f
auto merge of #8116 : toddaaro/rust/tls-tk-pr-pre, r=brson

Merged with task killing code this time around.