]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #39348 - steveklabnik:cyryl-mailmap, r=alexcrichton
authorAlex Crichton <alex@alexcrichton.com>
Fri, 27 Jan 2017 22:41:29 +0000 (14:41 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Sat, 28 Jan 2017 00:42:08 +0000 (16:42 -0800)
Fix cyryl's mailmap entry

1  2 
.mailmap

diff --cc .mailmap
Simple merge