X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=.mailmap;h=62407d6fa681f4964053a82ae9c21d55959db555;hb=1d981d16b744b000414cd5a2cc38db90d26d3903;hp=3ae74363e8c4aea3032f8f164dcaa61c56d09de7;hpb=e509433c1517494fbde32ded8c9101f12102029b;p=vlc

diff --git a/.mailmap b/.mailmap
index 3ae74363e8..62407d6fa6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -57,6 +57,7 @@ Basos G <noxelia@gmail.com> <noxelia 4t gmail c0m>
 <kelemeng@gnome.hu> <kelemeng at gnome dot hu>
 <tkrotoff@gmail.com> <tkrotoff at>
 Aurélien Nephtali <aurelien@sitadelle.com> <aurelien sitadelle.com>
+Aurélien Nephtali <aurelien.nephtali@gmail.com>
 Konstanty Bialkowski <konstanty@ieee.org> <konstanty@gmail.com>
 Pavlov Konstantin <thresh@videolan.org>
 <thresh@videolan.org> <thresh@altlinux.ru>
@@ -70,7 +71,8 @@ Brad Smith <brad@comstyle.com>
 <cristi@secarica.ro> <cristi.secarica.ro>
 <davidf@rd.bbc.co.uk> <davidf+nntp@woaf.net>
 <davidf@rd.bbc.co.uk> <davidf@woaf.net>
-Hugo Beauzée-Luyssen <beauze.h@gmail.com>
+Hugo Beauzée-Luyssen <hugo@beauzee.fr>
+<hugo@beauzee.fr> <beauze.h@gmail.com>
 <markfm@videolan.org> <mfmbusiness@earthlink.net>
 <markfm@videolan.org> <mfmori@hotmail.com>
 Nicolas Chauvet <kwizart@gmail.com>
@@ -123,6 +125,7 @@ Samuel Hocevar <sam@videolan.org>
 Samuel Hocevar <sam@videolan.org> Sam Hocevar <sam@zoy.org>
 Samuel Hocevar <sam@videolan.org> Sam Hocevar <sam@hocevar.net>
 Yannick Bréhon <y.brehon@qiplay.com>
+Rui Zhang <bbcallen@gmail.com>
 #
 # Preferred emails
 <malte@tancred.com> <malte@frontbase.com>