X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.mailmap;h=94f2938f11c269258c95fce8375e9f522d418450;hb=8968c8a103cd69202e4312ad497e641a8f027e88;hp=f476926832158d715f4e474f581655b8ff99f740;hpb=96515ccc7a41cc8968ee742cb4d65205582e0fe9;p=rust.git

diff --git a/.mailmap b/.mailmap
index f4769268321..94f2938f11c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -148,6 +148,7 @@ Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
 Joseph Martin <pythoner6@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <josephtlyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
+Joshua Nelson <jyn514@gmail.com> <joshua@yottadb.com>
 jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
 Junyoung Cho <june0.cho@samsung.com>
 Jyun-Yan You <jyyou.tw@gmail.com> <jyyou@cs.nctu.edu.tw>
@@ -229,6 +230,7 @@ Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
 Philipp Krones <hello@philkrones.com> flip1995 <hello@philkrones.com>
+Philipp Krones <hello@philkrones.com> <philipp.krones@embecosm.com>
 Philipp Matthias Schäfer <philipp.matthias.schaefer@posteo.de>
 Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
 Rafael Ávila de Espíndola <respindola@mozilla.com> Rafael Avila de Espindola <espindola@dream.(none)>