]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #5110 : pcwalton/rust/and-const, r=pcwalton
authorbors <bors@rust-lang.org>
Tue, 26 Feb 2013 18:06:45 +0000 (10:06 -0800)
committerbors <bors@rust-lang.org>
Tue, 26 Feb 2013 18:06:45 +0000 (10:06 -0800)
r? @brson


Trivial merge