Fine-tune mail map.

diff --git a/.mailmap b/.mailmap
index 40f2aeba9bd6fdab3ab6937065a1255eb3539393..72ec2a24100f7ec1bdfc18d4d4edf516aef89434 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Andrew Hawryluk <ahawryluk@gmail.com>
+Andrew Hawryluk <andrew@obi-wan.(none)> # or maybe Andrew Wilson
 Andrew Wilson <andrew@rivendale.net>
 Arjan Bos <arjan.bos@hetnet.nl>
 Carl D. Sorensen <carldsorensen>
@@ -9,12 +10,15 @@ Daniel Johnson <il.basso.buffo@gmail.com>
 Daniel Tonda Castillo <daniel.tonda@gmail.com>
 Dieter Grollmann <groll-ay@bluewin.ch>
 Ed Catmur <ed@capella.catmur.co.uk>
+Erik Sandberg <erik>
 Erlend Aasland <erlenda>
 Erlend Aasland <erlend.aasland@mac.com>
 Erlend Aasland <erlenda@gmail.com>
 Erlend Aasland <erlend@iMac.local>
 Eyolf Østrem <eyolf@oestrem.com>
-Francisco Vila <francisco.vila@hispalinux.es>
+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>
 Graham Percival <gpercival>
@@ -73,10 +77,13 @@ Graham Percival <gperciva@tsubasa.local>
 Graham Percival <gperciva@tsubasa.(none)>
 Graham Percival <gpermus@gmail.com>
 Graham Percival <graham@percival-music.ca>
+Graham Percival <root@tsubasa.(none)>
 Hajo Dezelski <dl1sdz@gmail.com>
+Han-Wen Nienhuys and Jan Nieuwenhuizen <fred> # see note below
 Han-Wen Nienhuys <hanwen>
 Han-Wen Nienhuys <hanwen@lilypond.org>
 Han-Wen Nienhuys <hanwen@xs4all.nl>
+Han-Wen Nienhuys <uid67283> #?
 Heikki Junes <hjunes>
 Heikki Junes <hjunes@gmail.com>
 Heikki Junes <hjunes@hjunes-laptop.(none)>
@@ -107,6 +114,8 @@ 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@ipd.uka.de>
 Kevin Dalley <kevin@kelphead.org>
 Kieren MacMillan <kieren_macmillan@sympatico.ca>
 Kurt Kroon <kroon@winfirst.com>
@@ -131,11 +140,9 @@ Neil Puttock <n.puttock@gmail.com>
 Nicolas Sceaux <nicolas@robert.local>
 Nicolas Sceaux <nicolas.sceaux@free.fr>
 Nicolas Sceaux <nsceaux>
-Paco Vila <francisco.vila@hispalinux.es>
-Paco Vila <fravd@salvia.(none)>
-Paco Vila <fravd@salvia.org>
 Patrick McCarty <pnorcks@gmail.com>
 Paul Jarc <prj@po.cwru.edu>
+Pedro Kroger <kroger>
 Ralph Palmer <palmeer.r.violin@gmail.com>
 Ralph Palmer <palmer.r.violin@gmail.com>
 Ralph Palmer <palmer.r.violin@treda.co.uk>
@@ -174,10 +181,5 @@ Wilbert Berendsen <wbsoft@xs4all.nl>
 Maximiliano <maxi@intelacer.(none)>
 Maximiliano <mxgdvg@yahoo.it>
 Lilypond GDP <lilypond@server.kainhofer.com>
-kroger <kroger>
-reuter <reuter>
-root <root@tsubasa.(none)>
-andrew <andrew@obi-wan.(none)>
-erik <erik>
-fred <fred>
-uid67283 <uid67283>
+
+# Note on <fred>: http://lists.gnu.org/archive/html/lilypond-devel/2009-02/msg00035.html