]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25262 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Sun, 10 May 2015 05:32:20 +0000 (05:32 +0000)
committerbors <bors@rust-lang.org>
Sun, 10 May 2015 05:32:20 +0000 (05:32 +0000)
- Successful merges: #25200, #25242, #25248, #25249, #25251, #25252, #25261
- Failed merges: #25255


Trivial merge