[vlc-commits] More mailmap fixes and simplifications

[Christoph Miebach]

vlc/vlc-2.0 | branch: master | Christoph Miebach <christoph.miebach at web.de> | Thu Mar  8 11:12:22 2012 +0100| [d011a986a719f718918423c419de09fdb5c755fe] | committer: Jean-Baptiste Kempf

More mailmap fixes and simplifications

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit e509433c1517494fbde32ded8c9101f12102029b)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d011a986a719f718918423c419de09fdb5c755fe
---

 .mailmap |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/.mailmap b/.mailmap
index af449e1..3ae7436 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,7 +98,8 @@ Alexander Law <exclusion at gmail.com>
 Denis Arnaud <denisarnuad at yahoo.fr>
 Éric Lassauge <lassauge at users.sf.net>
 Faustino Osuna <riquedafreak at videolan.org>
-Mihkel Kirjutas <turakas at gmail.com> 
+Faustino Osuna <riquedafreak at videolan.org> Faustino E. Osuna <enrique.osuna at gmail.com>
+Mihkel Kirjutas <turakas at gmail.com>
 Naohiro Koriyama <nkoriyama at gmail.com>
 Predrag Ljubenović <predragljubenovic at gmail.com>
 Ajith Manjula Senarathne <uthmax.sms at gmail.com>
@@ -110,6 +111,18 @@ Jérôme Decoodt <djc at videolan.org> Jérôme Decoodt <djc+git at videolan.org>
 Matej Urban <matej.urban at gmail.com> Matej Urbančič <mateju at svn.gnome.org>
 Xabier Aramendi <azpidatziak at gmail.com>
 Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
+Frédéric Yhuel <fyhuel at viotech.net>
+Ming Hu <tewilove at gmail.com>
+Kuan-Chung Chiu <buganini at gmail.com>
+Cédric Cocquebert <cedric.cocquebert at cea.fr>
+François Cartegnie <fcvlcdev at free.fr>
+Jean-Paul Saman <jpsaman at videolan.org>
+Jean-Paul Saman <jpsaman at videolan.org> jpsaman at m2x.nl <jpsaman at m2x.nl>
+Jean-Paul Saman <jpsaman at videolan.org> Jean-Paul Saman <jean-paul.saman at m2x.nl>
+Samuel Hocevar <sam at videolan.org>
+Samuel Hocevar <sam at videolan.org> Sam Hocevar <sam at zoy.org>
+Samuel Hocevar <sam at videolan.org> Sam Hocevar <sam at hocevar.net>
+Yannick Bréhon <y.brehon at qiplay.com>
 #
 # Preferred emails
 <malte at tancred.com> <malte at frontbase.com>