]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14322 : thestinger/rust/secret_santa_heap, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 22 May 2014 08:06:25 +0000 (01:06 -0700)
committerbors <bors@rust-lang.org>
Thu, 22 May 2014 08:06:25 +0000 (01:06 -0700)

Trivial merge