X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=.mailmap;h=717463ef204f44114e68eb9bd883668bb48b8cc6;hb=398bac6ba1602e40aaa3a9cedaf2fdce608876f9;hp=af449e17c82231a7bd7ceeebb6e69b09a003d798;hpb=dc28b94159fec2deba1b5ea1d1b4a1d3ddbe79c7;p=vlc

diff --git a/.mailmap b/.mailmap
index af449e17c8..717463ef20 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>
@@ -98,7 +100,8 @@ Alexander Law <exclusion@gmail.com>
 Denis Arnaud <denisarnuad@yahoo.fr>
 Éric Lassauge <lassauge@users.sf.net>
 Faustino Osuna <riquedafreak@videolan.org>
-Mihkel Kirjutas <turakas@gmail.com> 
+Faustino Osuna <riquedafreak@videolan.org> Faustino E. Osuna <enrique.osuna@gmail.com>
+Mihkel Kirjutas <turakas@gmail.com>
 Naohiro Koriyama <nkoriyama@gmail.com>
 Predrag Ljubenović <predragljubenovic@gmail.com>
 Ajith Manjula Senarathne <uthmax.sms@gmail.com>
@@ -109,10 +112,25 @@ Jérôme Decoodt <djc@videolan.org>
 Jérôme Decoodt <djc@videolan.org> Jérôme Decoodt <djc+git@videolan.org>
 Matej Urban <matej.urban@gmail.com> Matej Urbančič <mateju@svn.gnome.org>
 Xabier Aramendi <azpidatziak@gmail.com>
-Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
+Gwenole Beauchesne <gb.devel@gmail.com> <gbeauchesne@splitted-desktop.com>
+Frédéric Yhuel <fyhuel@viotech.net>
+Ming Hu <tewilove@gmail.com>
+Kuan-Chung Chiu <buganini@gmail.com>
+Cédric Cocquebert <cedric.cocquebert@cea.fr>
+François Cartegnie <fcvlcdev@free.fr>
+Jean-Paul Saman <jpsaman@videolan.org>
+Jean-Paul Saman <jpsaman@videolan.org> jpsaman@m2x.nl <jpsaman@m2x.nl>
+Jean-Paul Saman <jpsaman@videolan.org> Jean-Paul Saman <jean-paul.saman@m2x.nl>
+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>
 <xtophe@videolan.org> <xtophe@chewa.net>
 <hartman@videolan.org> <hartman@veda.student.utwente.nl>
 <etix@videolan.org> <etix@l0cal.com>
+<steven@m20.nl> <skramer@inbeeld.eu>
+<jarmo.torvinen@iki.fi> <jarmo.torvinen@jutel.fi>