Rollup merge of #41715 - martinhath:master, r=aturon

frewsxcv · web-flow · commit e2cedb249f00 · 2017-05-03T18:34:01.000-04:00
Fix @martinhath's mailmap entry I stumbled upon a name duplication issue in [rust-lang-nursery/thanks](https://github.com/rust-lang-nursery/thanks/), and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (`git shortlog | grep "Thoresen"` only returns one entry instead of two). I didn't bother creating an issue in the `thanks` repository, since I did the `.mailmap` editing myself.
diff --git a/.mailmap b/.mailmap
@@ -139,6 +139,7 @@ Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
 Mark Sinclair <mark.edward.x@gmail.com>
 Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com>
 Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
+Martin Hafskjold Thoresen <martinhath@gmail.com>
 Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com>
 Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
 Matthew Auld <matthew.auld@intel.com>

-Original file line number
+Diff line change
 Mark Sinclair <[email protected]>
 Mark Sinclair <[email protected]> =Mark Sinclair <[email protected]>
 Markus Westerlind <[email protected]> Markus <[email protected]>
 +Martin Hafskjold Thoresen <[email protected]>
 Matej Lach <[email protected]> Matej Ľach <[email protected]>
 Matt Brubeck <[email protected]> <[email protected]>
 Matthew Auld <[email protected]>