]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #23796 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 27 Mar 2015 23:11:21 +0000 (23:11 +0000)
committerbors <bors@rust-lang.org>
Fri, 27 Mar 2015 23:11:21 +0000 (23:11 +0000)

Trivial merge