]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #21919 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 4 Feb 2015 06:40:12 +0000 (06:40 +0000)
committerbors <bors@rust-lang.org>
Wed, 4 Feb 2015 06:40:12 +0000 (06:40 +0000)

Trivial merge