]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #7432 : michaelwoerister/rust/WP3, r=jdm
authorbors <bors@rust-lang.org>
Fri, 28 Jun 2013 00:22:42 +0000 (17:22 -0700)
committerbors <bors@rust-lang.org>
Fri, 28 Jun 2013 00:22:42 +0000 (17:22 -0700)

Trivial merge