]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12944 : mcpherrinm/rust/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 17 Mar 2014 05:31:55 +0000 (22:31 -0700)
committerbors <bors@rust-lang.org>
Mon, 17 Mar 2014 05:31:55 +0000 (22:31 -0700)

Trivial merge