]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #6055 : cmr/rust/incoming, r=graydon,brson
authorbors <bors@rust-lang.org>
Thu, 25 Apr 2013 20:30:36 +0000 (13:30 -0700)
committerbors <bors@rust-lang.org>
Thu, 25 Apr 2013 20:30:36 +0000 (13:30 -0700)

Trivial merge