]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #24156 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Tue, 7 Apr 2015 16:44:11 +0000 (16:44 +0000)
committerbors <bors@rust-lang.org>
Tue, 7 Apr 2015 16:44:11 +0000 (16:44 +0000)

Trivial merge