]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #18978 : jakub-/rust/roll-up, r=cmr
authorbors <bors@rust-lang.org>
Sun, 16 Nov 2014 11:27:35 +0000 (11:27 +0000)
committerbors <bors@rust-lang.org>
Sun, 16 Nov 2014 11:27:35 +0000 (11:27 +0000)

Trivial merge