]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7490 : mozilla/rust/rollup, r=thestinger
authorbors <bors@rust-lang.org>
Sun, 30 Jun 2013 06:34:43 +0000 (23:34 -0700)
committerbors <bors@rust-lang.org>
Sun, 30 Jun 2013 06:34:43 +0000 (23:34 -0700)
603137c r=cmr
fe10db2 r=bstrie


Trivial merge