]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #5480 : pcwalton/rust/at-const, r=pcwalton
authorbors <bors@rust-lang.org>
Fri, 22 Mar 2013 03:39:51 +0000 (20:39 -0700)
committerbors <bors@rust-lang.org>
Fri, 22 Mar 2013 03:39:51 +0000 (20:39 -0700)
r? @catamorphism


Trivial merge