]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #13200 : sfackler/rust/test-attr, r=cmr
authorbors <bors@rust-lang.org>
Sat, 29 Mar 2014 23:11:36 +0000 (16:11 -0700)
committerbors <bors@rust-lang.org>
Sat, 29 Mar 2014 23:11:36 +0000 (16:11 -0700)

Trivial merge