]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #24759 - Manishearth:rollup2, r=Manishearth
authorbors <bors@rust-lang.org>
Fri, 24 Apr 2015 05:09:31 +0000 (05:09 +0000)
committerbors <bors@rust-lang.org>
Fri, 24 Apr 2015 05:09:31 +0000 (05:09 +0000)
r? @Manishearth


Trivial merge