]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #25790 - eddyb:oh-snap-ctfe-arrived, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 27 May 2015 08:47:53 +0000 (08:47 +0000)
committerbors <bors@rust-lang.org>
Wed, 27 May 2015 08:47:53 +0000 (08:47 +0000)

Trivial merge