summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJan Zerebecki <jan.mozilla@zerebecki.de>2017-02-09 01:45:58 +0100
committerJan Zerebecki <jan.mozilla@zerebecki.de>2017-02-09 02:10:14 +0100
commit0dbdb2d0d08818ffe61ab0c1024356957ba0a543 (patch)
treef8143a1fb1b1ec9b12e419e16c48c6778e6d9af6 /.mailmap
parentAuto merge of #39523 - alexcrichton:fpic, r=aturon (diff)
downloadgrust-0dbdb2d0d08818ffe61ab0c1024356957ba0a543.tar.gz
grust-0dbdb2d0d08818ffe61ab0c1024356957ba0a543.tar.bz2
grust-0dbdb2d0d08818ffe61ab0c1024356957ba0a543.tar.xz
Fix mailmap for @gifnksm
cc rust-lang-nursery/thanks#71
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 2 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index 1ae0aae2d0..4b4f343d15 100644
--- a/.mailmap
+++ b/.mailmap
@@ -132,9 +132,8 @@ Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com>
132Luke Metz <luke.metz@students.olin.edu> 132Luke Metz <luke.metz@students.olin.edu>
133Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca> 133Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
134Luqman Aden <me@luqman.ca> <laden@mozilla.com> 134Luqman Aden <me@luqman.ca> <laden@mozilla.com>
135Makoto Nakashima <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com> 135NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm@gmail.com>
136Makoto Nakashima <makoto.nksm+github@gmail.com> gifnksm <makoto.nksm+github@gmail.com> 136NAKASHIMA, Makoto <makoto.nksm+github@gmail.com> <makoto.nksm+github@gmail.com>
137Makoto Nakashima <makoto.nksm+github@gmail.com> NAKASHIMA, Makoto <makoto.nksm+github@gmail.com>
138Marcell Pardavi <marcell.pardavi@gmail.com> 137Marcell Pardavi <marcell.pardavi@gmail.com>
139Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew> 138Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
140Mark Sinclair <mark.edward.x@gmail.com> 139Mark Sinclair <mark.edward.x@gmail.com>
@@ -150,7 +149,6 @@ Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
150Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com> 149Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com>
151Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com> 150Ms2ger <ms2ger@gmail.com> <Ms2ger@gmail.com>
152Mukilan Thiagarajan <mukilanthiagarajan@gmail.com> 151Mukilan Thiagarajan <mukilanthiagarajan@gmail.com>
153NAKASHIMA, Makoto <makoto.nksm+github@gmail.com>
154Nathan Wilson <wilnathan@gmail.com> 152Nathan Wilson <wilnathan@gmail.com>
155Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu> 153Nathaniel Herman <nherman@post.harvard.edu> Nathaniel Herman <nherman@college.harvard.edu>
156Neil Pankey <npankey@gmail.com> <neil@wire.im> 154Neil Pankey <npankey@gmail.com> <neil@wire.im>