]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #22153 - alexcrichton:rollup, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 10 Feb 2015 19:52:04 +0000 (19:52 +0000)
committerbors <bors@rust-lang.org>
Tue, 10 Feb 2015 19:52:04 +0000 (19:52 +0000)

Trivial merge