]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8303 : brson/rust/tls-magic-wtf, r=brson
authorbors <bors@rust-lang.org>
Mon, 5 Aug 2013 07:56:00 +0000 (00:56 -0700)
committerbors <bors@rust-lang.org>
Mon, 5 Aug 2013 07:56:00 +0000 (00:56 -0700)

Trivial merge