]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14263 : cmr/rust/termex, r=kballard
authorbors <bors@rust-lang.org>
Sun, 18 May 2014 23:31:31 +0000 (16:31 -0700)
committerbors <bors@rust-lang.org>
Sun, 18 May 2014 23:31:31 +0000 (16:31 -0700)

Trivial merge