]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7371 : alexcrichton/rust/trying, r=cmr
authorbors <bors@rust-lang.org>
Tue, 25 Jun 2013 17:47:01 +0000 (10:47 -0700)
committerbors <bors@rust-lang.org>
Tue, 25 Jun 2013 17:47:01 +0000 (10:47 -0700)
This is an attempt at a smaller request than #7113, it's just the first two commits


Trivial merge