]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #23681 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 25 Mar 2015 01:42:42 +0000 (01:42 +0000)
committerbors <bors@rust-lang.org>
Wed, 25 Mar 2015 01:42:42 +0000 (01:42 +0000)

Trivial merge