]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #22192 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 12 Feb 2015 00:38:24 +0000 (00:38 +0000)
committerbors <bors@rust-lang.org>
Thu, 12 Feb 2015 00:38:24 +0000 (00:38 +0000)

Trivial merge