X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.mailmap;fp=.mailmap;h=ea5f7ebf1184f1e5908b5a8c6b8c3af74909e40f;hb=4ad94543355d4fd082cb1729301fd737bcbd276e;hp=ca331e073b76aba6175dd95c2c208a34be4cec48;hpb=11d9faab891304da587d957440d8808fc6699e94;p=lilypond.git

diff --git a/.mailmap b/.mailmap
index ca331e073b..ea5f7ebf11 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,7 +20,7 @@ Francisco Vila <francisco.vila@hispalinux.es> # AKA Paco Vila
 Francisco Vila <fravd@salvia.(none)>
 Francisco Vila <fravd@salvia.org>
 Francisco Vila <paconet.org@gmail.com>
-Frederic Bron <frederic.bron@m4x.org>
+Frédéric Bron <frederic.bron@m4x.org>
 Graham Percival <gpercival>
 Graham Percival <gperciva@gperciva-desktop.(none)>
 Graham Percival <gperciva@opihi.cs.uvic.ca>
@@ -116,7 +116,7 @@ John Mandereau <lilydev@freemousse.(none)>
 Jonathan Kulp <jon@bashtop.(none)>
 Jonathan Kulp <jonlancekulp@gmail.com>
 Joseph Wakeling <joseph.wakeling@webdrake.net>
-Jürgen Reuter <reuter> 
+Jürgen Reuter <reuter>
 Jürgen Reuter <reuter@ipd.uka.de>
 Kevin Dalley <kevin@kelphead.org>
 Kieren MacMillan <kieren_macmillan@sympatico.ca>
@@ -158,8 +158,6 @@ Risto Vääräniemi <risvaara@gmail.com>
 Rune Zedeler <rune@zedeler.dk>
 Rune Zedeler <rz>
 Rune Zedeler <rz@daimi.au.dk>
-Sawada Yoshiki <sawada@ubuntu.ubuntu-domain>
-Sawada Yoshiki <sawada.yoshiki@gmail.com>
 Simon Bailey <binabik@gmail.com>
 Simon Bailey <binabik@pc6143-c703.uibk.ac.at>
 Stefan Weil <weil@mail.berlios.de>
@@ -179,5 +177,7 @@ Werner Lemberg <wl@rigel.orion>
 Werner Lemberg <wl@rigel.site>
 Wilbert Berendsen <lilykde@xs4all.nl>
 Wilbert Berendsen <wbsoft@xs4all.nl>
+Yoshiki Sawada <sawada@ubuntu.ubuntu-domain>
+Yoshiki Sawada <sawada.yoshiki@gmail.com>
 
 # Note on <fred>: http://lists.gnu.org/archive/html/lilypond-devel/2009-02/msg00035.html