]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7479 : mozilla/rust/rollup, r=thestinger
authorbors <bors@rust-lang.org>
Sat, 29 Jun 2013 05:25:48 +0000 (22:25 -0700)
committerbors <bors@rust-lang.org>
Sat, 29 Jun 2013 05:25:48 +0000 (22:25 -0700)
22b7eb3 r=thestinger
28a3613 r=cmr
a0c31ec r=bstrie
ee7307e r=thestinger
b9cf6a3 r=thestinger

1  2 
src/librustc/middle/trans/meth.rs

Simple merge