]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12484 : TheHydroImpulse/rust/fix_js, r=huonw
authorbors <bors@rust-lang.org>
Sun, 23 Feb 2014 22:22:04 +0000 (14:22 -0800)
committerbors <bors@rust-lang.org>
Sun, 23 Feb 2014 22:22:04 +0000 (14:22 -0800)

Trivial merge