]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25340 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Tue, 12 May 2015 19:11:44 +0000 (19:11 +0000)
committerbors <bors@rust-lang.org>
Tue, 12 May 2015 19:11:44 +0000 (19:11 +0000)
- Successful merges: #24996, #25220, #25221, #25267, #25322, #25327, #25329, #25330, #25331, #25335
- Failed merges: #25334


Trivial merge