]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #9310 : pcwalton/rust/at-fn, r=pcwalton
authorbors <bors@rust-lang.org>
Tue, 24 Sep 2013 02:20:58 +0000 (19:20 -0700)
committerbors <bors@rust-lang.org>
Tue, 24 Sep 2013 02:20:58 +0000 (19:20 -0700)
r? @brson

1  2 
src/librustpkg/tests.rs

Simple merge