]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #24524 - Manishearth:rollup, r=Manishearth
authorbors <bors@rust-lang.org>
Fri, 17 Apr 2015 18:29:48 +0000 (18:29 +0000)
committerbors <bors@rust-lang.org>
Fri, 17 Apr 2015 18:29:48 +0000 (18:29 +0000)

Trivial merge