[vlc-commits] Update mailmap

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct  3 15:29:56 2012 +0200| [313e047e917bc4468a9b5995300f860bd9de8a70] | committer: Jean-Baptiste Kempf

Update mailmap

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

 .mailmap |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 62407d6..717463e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -112,7 +112,7 @@ Jérôme Decoodt <djc at videolan.org>
 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>
+Gwenole Beauchesne <gb.devel at gmail.com> <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>
@@ -132,3 +132,5 @@ Rui Zhang <bbcallen at gmail.com>
 <xtophe at videolan.org> <xtophe at chewa.net>
 <hartman at videolan.org> <hartman at veda.student.utwente.nl>
 <etix at videolan.org> <etix at l0cal.com>
+<steven at m20.nl> <skramer at inbeeld.eu>
+<jarmo.torvinen at iki.fi> <jarmo.torvinen at jutel.fi>