Corrrected license files.

All mail entries in domain-map, are now:
- present in licensePersonal.csv
- target (if used) in aliases

next step is test of mkstat and esc-mentoring

3 files changed, 129 insertions, 122 deletions

diff --git a/aliases b/aliases
index 2a4d49ac..34318353 100644
--- a/aliases
+++ b/aliases
@@ -1,9 +1,10 @@
+robin.r.kumar@ericsson.com 2robinsaini@gmail.com
 aidan@openoffice.org abutler@openoffice.org
-af@openoffice.org af@apache.org
-andre.f.fischer@oracle.com af@apache.org
-af@a-w-f.de af@apache.org
-"andre.f.fischer andre fischerandre.f.fischer@oracle.com" af@apache.org
-fischer<andre.f.fischer@oracle.com af@apache.org
+af@apache.org af@a-w-f.de
+af@openoffice.org af@a-w-f.de
+andre.f.fischer@oracle.com af@a-w-f.de
+"andre.f.fischer andre fischerandre.f.fischer@oracle.com" af@a-w-f.de
+fischer<andre.f.fischer@oracle.com af@a-w-f.de
 thuswa@gmail.com albert.thuswaldner@gmail.com
 alexanderwerner@vm162.documentfoundation.org alexanderwerner@floyd.documentfoundation.org
 alex@wub-akustik.de alexanderwerner@floyd.documentfoundation.org
@@ -22,12 +23,11 @@ xiscofauli@libreoffice.org anistenis@gmail.com
 aparajitah@gmail.com aparajita@haldar.org
 aptitude@btconnect.com apitude@btconnect.com
 priyanka.gaikwad@synerzip.com apriyadarshi.1995@gmail.com
-armin.le.grand@sun.com armin.le.grand@cib.de
-armin@openoffice.org armin.le.grand@cib.de
-armin.le.grand@me.com armin.le.grand@cib.de
-alg@apache.org armin.le.grand@cib.de
-aw@openoffice.org armin.le.grand@cib.de
-armin.le.grand@oracle.com armin.le.grand@cib.de
+armin.le.grand@cib.de armin.le.grand@me.com
+armin.le.grand@sun.com armin.le.grand@me.com
+alg@apache.org armin.le.grand@me.com
+aw@openoffice.org armin.le.grand@me.com
+armin.le.grand@oracle.com armin.le.grand@me.com
 arnaud.versini@libreoffice.org arnaud.versini@gmail.com
 arnotixe@gmail arnotixe@gmail.com
 artur.dorda+libo@gmail.com artur.dorda@gmail.com
@@ -49,6 +49,10 @@ bluedwarf@bpost.plala.or.jp bluedwarf@bpost.plala.org.jp
 babak.mahbod@openoffice.org bmahbod@openoffice.org
 brennan.vincent@gmail.com brennanv@email.arizona.edu
 fou@leila.(none) brutus@free.fr
+katarina.behrens@cib.de bubli@bubli.org
+kmachalkova@suse.cz bubli@bubli.org
+kmachalkova@ben.suse.cz bubli@bubli.org
+kmachalkova@novell.com bubli@bubli.org
 jiri.burant92@gmail.com burant.j@seznam.cz
 cbosdonnat@novell.com cedric.bosdonnat.ooo@free.fr
 cedric.bosdonnat@free.fr cedric.bosdonnat.ooo@free.fr
@@ -58,8 +62,9 @@ chris.sherlock79 chris.sherlock79@gmail.com
 "chris sherlock chris.sherlock79@gmail.com" chris.sherlock79@gmail.com
 christian@twotoasts.de christian.dywan@lanedo.com
 christian@lanedo.com christian.dywan@lanedo.com
-christoph.lutz@cib.de christoph.lutz_ml@cib.de
 christoph.noack@documentfoundation.org christoph@dogmatux.com
+christoph.lutz@cib.de chrlutz@googlemail.com
+christoph.lutz_ml@cib.de chrlutz@googlemail.com
 chr.rossmanith@gmx.de chrrossmanith@gmx.de
 chrrossmanith@web.de chrrossmanith@gmx.de
 "christina rossmanith" chrrossmanith@gmx.de
@@ -67,9 +72,9 @@ e12346@ce.pdn.ac.lk chudugama@gmail.com
 christian.lippka@oracle.com cl@openoffice.org
 christian.lippka@sun.com cl@openoffice.org
 cl@lippka.com cl@openoffice.org
-cloph@openoffice.org cloph@floyd.documentfoundation.org
-lohmaier+github@googlemail.com cloph@floyd.documentfoundation.org
-lohmaier+libreoffice@googlemail.com cloph@floyd.documentfoundation.org
+cloph@floyd.documentfoundation.org cloph@openoffice.org
+lohmaier+github@googlemail.com cloph@openoffice.org
+lohmaier+libreoffice@googlemail.com cloph@openoffice.org
 caolanm@redhat.com cmc@openoffice.org
 caolan@localhost.localdomain cmc@openoffice.org
 caolan@minimac.(none) cmc@openoffice.org
@@ -92,21 +97,21 @@ daniel.rentz@oracle.com dr@openoffice.org
 daniel.rentz@sun.com dr@openoffice.org
 root@fedora1.s390.bos.redhat.com dtardon@redhat.com
 dtardon@openoffice.org dtardon@redhat.com
+hdu@apache.org duerr@de.ibm.com
+hdu@openoffice.org duerr@de.ibm.com
+duerr@sun.com duerr@de.ibm.com
+herbert.duerr@oracle.com duerr@de.ibm.com
 jaquilina@eagleeyet.net eagles051387@gmail.com
-eilidh.mcadam@itomig.de eilidh.mcadam@gmail.com
-tibbylickle@gmail.com eilidh.mcadam@gmail.com
-tibbylickle@googlemail.com eilidh.mcadam@gmail.com
-eilidh@lanedo.com eilidh.mcadam@gmail.com
 drocha616@gmail.com ejrsfnm4@yahoo.com
 elton@elton.tk elton@layerjet.com
 metuxitservice@googlemail.com enrico.weigelt@vnc.biz
-erack@erack.de erack@redhat.com
-"erack@redhat.com, erack@erack.de" erack@redhat.com
-ooo@erack.de erack@redhat.com
-eike.rathke@oracle.com erack@redhat.com
-erack@openoffice.org erack@redhat.com
-er@openoffice.org erack@redhat.com
-erack@sun.com erack@redhat.com
+erack@redhat.com er@openoffice.org
+erack@sun.com er@openoffice.org
+erack@erack.de er@openoffice.org
+"erack@redhat.com, erack@erack.de" er@openoffice.org
+ooo@erack.de er@openoffice.org
+eike.rathke@oracle.com er@openoffice.org
+erack@openoffice.org er@openoffice.org
 github@nosperse.com eric@seynaeve.be
 ebachard@gnome.org ericb@openoffice.org
 robert.roth.off@gmail.com evfool@gmail.com
@@ -156,10 +161,6 @@ haggai@openoffice.org halls@debian.org
 hamidi.massinissa@gmail.com hamidimassinissa@gmail.com
 haochen@multicorewarein.com haochen@multicorewareinc.com
 hcastro@collabora.com hcvcastro@gmail.com
-herbert.duerr@oracle.com hdu@apache.org
-duerr@de.ibm.com hdu@apache.org
-hdu@openoffice.org hdu@apache.org
-duerr@sun.com hdu@apache.org
 heinzlesspam@googlemail.com heinzlesspam@gmail.com
 jens-heiner.rechtien@oracle.com hr@openoffice.org
 husain.amri@me.com husain.amri@gmail.com
@@ -182,14 +183,14 @@ joel@joel-studio-1737.(none) jmadero.dev@gmail.com
 joel.madero@gmail.com jmadero.dev@gmail.com
 janneke@gnu.org jnieuwenhuizen@novell.com
 jody@gnome.org jody@novell.com
+jsc@apache.org jogischmidt@googlemail.com
+jsc@openoffice.org jogischmidt@googlemail.com
 jmarmion@openoffice.org john.marmion@openoffice.org
 joren.de.cuyper@telenet.be jorendc@libreoffice.org
 joren.libreoffice@telenet.be jorendc@libreoffice.org
 jpower27@cox.net jpowers27@cox.net
-jsc@openoffice.org jsc@apache.org
-jogischmidt@googlemail.com jsc@apache.org
 joerg.skottke@sun.com jsk@openoffice.org
-"joerg skottke [jsk]" jsk@openoffice.org jsk@openoffice.org
+"joerg skottke [jsk]" jsk@openoffice.org
 github@nmehne.de julian.mehne@gmail.com
 julio.hoffiman@gmail.com julio.hoffimann@gmail.com
 laurent.balland-poirier@laposte.net jumbo4444@yahoo.fr
@@ -198,19 +199,23 @@ kai.ahrens@sun.com ka@openoffice.org
 kami@darth.(none) kami911@gmail.com
 kamihir@freemail.hu kami911@gmail.com
 kano@na.rim.or.jp kano@rim.or.jp
-bubli@bubli.org katarina.behrens@cib.de
-kmachalkova@suse.cz katarina.behrens@cib.de
-kmachalkova@ben.suse.cz katarina.behrens@cib.de
-kmachalkova@novell.com katarina.behrens@cib.de
 n.r.pearson@gmail.com kb9vqf@pearsoncomputing.net
 kelemeng@gnome.hu kelemeng@ubuntu.com
-kendy@meluzina.hloubetin kendy@suse.cz
-kendy@dhcp28.suze.cz kendy@suse.cz
-kendy@collabora.com kendy@suse.cz
-kendy@notthere.aliasdomain.foo kendy@suse.cz
-kendy@noe.suse.cz kendy@suse.cz
+kendy@suse.cz kendy@notthere.aliasdomain.foo
+kendy@meluzina.hloubetin kendy@notthere.aliasdomain.foo
+kendy@dhcp28.suze.cz kendy@notthere.aliasdomain.foo
+kendy@collabora.com kendy@notthere.aliasdomain.foo
+kendy@noe.suse.cz kendy@notthere.aliasdomain.foo
 c@apache.orgenneth_lists@aafloy.net kenneth_lists@aafloy.net
 kevin@alliknow.net kevin.hausmann@gmail.com
+libreoffice@kohei.us kohei@openoffice.org
+kohei.yoshida@suse.com kohei@openoffice.org
+kohei.yoshida@suse.de kohei@openoffice.org
+kyoshida@novell.com kohei@openoffice.org
+kohei.yoshida@gmail.com kohei@openoffice.org
+kohei.yoshida@collabora.com kohei@openoffice.org
+kohei@lenovo-quad.(none) kohei@openoffice.org
+kyoshida@kohei-lenovo.(none) kohei@openoffice.org
 kris.kr296@yahoo.in kris.kr296@gmail.com
 sebetic.krunoslav@gmail.com kruno0407@gmail.com
 kruno.se@gmx.com kruno0407@gmail.com
@@ -225,14 +230,6 @@ leiw@cn.ibm.com leiw@apache.org
 jlc@mail2lee.com lemoyne.castle@gmail.com
 oooconv@free.fr lgodard.libre@laposte.net
 listes.godard@laposte.net lgodard.libre@laposte.net
-kohei.yoshida@suse.com libreoffice@kohei.us
-kohei@openoffice.org libreoffice@kohei.us
-kohei.yoshida@suse.de libreoffice@kohei.us
-kyoshida@novell.com libreoffice@kohei.us
-kohei.yoshida@gmail.com libreoffice@kohei.us
-kohei.yoshida@collabora.com libreoffice@kohei.us
-kohei@lenovo-quad.(none) libreoffice@kohei.us
-kyoshida@kohei-lenovo.(none) libreoffice@kohei.us
 ploum@ploum.net lionel@lanedo.com
 lionel.mamane@gestman.lu lionel@mamane.lu
 lodevlist@ogersoft.at lodev@ogersoft.at
@@ -264,27 +261,27 @@ gerrit@gerrit.libreoffice.org me@siqi.fr
 siqi.liu43@gmail.com me@siqi.fr
 matthias.huetsch@oracle.com mhu@openoffice.org
 matthias.huetsch@sun.com mhu@openoffice.org
-michael@linux.site michael.meeks@suse.com
-mmeeks@suse.com michael.meeks@suse.com
-mmeeks@openoffice.org michael.meeks@suse.com
-michael.meeks@collabora.com michael.meeks@suse.com
-michael.meeks@novell.com michael.meeks@suse.com
-mitch@gimp.org michael.natterer@lanedo.com
 mdunphy@uwaterloo.ca michael.w.dunphy@gmail.com
 mihai.varga@collabora.com mihai.mv13@gmail.com
 mikew@whiteley.org mike@whiteley.org
 mike.kaganski@collabora.com mikekaganski@hotmail.com
+michael.natterer@lanedo.com mitch@gimp.org
 michel.loiseleur@free.fr mloiseleur@linagora.com
 mathias.supp@vector.com mmathias.supp@vector.com
+michael.meeks@suse.com mmeeks@openoffice.org
+michael@linux.site mmeeks@openoffice.org
+mmeeks@suse.com mmeeks@openoffice.org
+michael.meeks@collabora.com mmeeks@openoffice.org
+michael.meeks@novell.com mmeeks@openoffice.org
 mmetz@adrian-brother.net mmetz@adrian-broher.net
 marco.cecchetti@collabora.com mrcekets@gmail.com
-mst@openoffice.org mstahl@redhat.com
-michael.x.stahl@oracle.com mstahl@redhat.com
+mstahl@redhat.com mst@openoffice.org
+michael.x.stahl@oracle.com mst@openoffice.org
 msvec@suse.com msvec@novell.com
 malte.timmermann@sun.com mt@openoffice.org
 malte.timmermann@oracle.com mt@openoffice.org
 martin@gallwey.com mtg@openoffice.org
-muthusuba@gmail.com muthu.subramanian.karunanidhi@ericsson.com
+muthu.subramanian.karunanidhi@ericsson.com muthusuba@gmail.com
 alexnivan@yahoo.com myromeu@ya.ru
 nigel.hawkins@inmail24.com n.hawkins@gmx.com
 n.hawkins-kk0ffgbhmju@public.gmane.org n.hawkins@gmx.com
@@ -295,13 +292,13 @@ nemeth@collabora.com nemeth@numbertext.org
 nemeth@openoffice.org nemeth@numbertext.org
 netrolller.3d@gmail.com netroller.3d@gmail.com
 nifgraup@google.com nifgraup@gmail.com
-nopower@novell.com noel.power@novell.com
-nopower@suse.com noel.power@novell.com
-noel.power@suse.com noel.power@novell.com
-npower@openoffice.org noel.power@novell.com
-npower@linux-h0uc.site noel.power@novell.com
-noel.grandin@collabora.co.uk noel@peralex.com
-noelgrandin@gmail.com noel@peralex.com
+noel.grandin@collabora.co.uk noelgrandin@gmail.com
+noel@peralex.com noelgrandin@gmail.com
+noel.power@novell.com npower@openoffice.org
+nopower@novell.com npower@openoffice.org
+nopower@suse.com npower@openoffice.org
+noel.power@suse.com npower@openoffice.org
+npower@linux-h0uc.site npower@openoffice.org
 nthieabaud@gmail.com nthiebaud@gmail.com
 norbert@sqdata.com nthiebaud@gmail.com
 n_th@linux-uefb.site nthiebaud@gmail.com
@@ -309,15 +306,15 @@ n_th@macbook-air.local nthiebaud@gmail.com
 oliver.craemer@oracle.com oc@openoffice.org
 ocke.janssen@sun.com oj@openoffice.org
 ocke.janssen@oracle.com oj@openoffice.org
-ohallot@collabora.co.uk olivier.hallot@edxsrv.br
-olivier.hallot@collabora.com olivier.hallot@edxsrv.br
-dirfin@broffice.org olivier.hallot@edxsrv.br
-olivier.hallot@documentfoundation.org olivier.hallot@edxsrv.br
-olivier.hallot@alta.org.br olivier.hallot@edxsrv.br
-olivier.hallot@edx.srv.br olivier.hallot@edxsrv.br
+olivier.hallot@edxsrv.br olivier.hallot@edx.srv.br
+ohallot@collabora.co.uk olivier.hallot@edx.srv.br
+olivier.hallot@collabora.com olivier.hallot@edx.srv.br
+dirfin@broffice.org olivier.hallot@edx.srv.br
+olivier.hallot@documentfoundation.org olivier.hallot@edx.srv.br
+olivier.hallot@alta.org.br olivier.hallot@edx.srv.br
 cor.nouws@documentfoundation.org oolst@nouenoff.nl
-od@openoffice.org orw@apache.org
-orwittmann@googlemail.com orw@apache.org
+orw@apache.org orwittmann@googlemail.com
+od@openoffice.org orwittmann@googlemail.com
 oliver.specht@cib.de os@openoffice.org
 owen.genat@gmail.com owenthomasanderson@gmail.com
 ozcan.esen@collabora.com ozcanesen@gmail.com
@@ -360,7 +357,6 @@ robert@einsle.de robert.einsle@mawoh.de
 robert.sedak@roby.hr robert.sedak@sk.t-com.hr
 robert.sedak@sk.htnet.hr robert.sedak@sk.t-com.hr
 robert.nagy@gmail.com robert@openbsd.org
-2robinsaini@gmail.com robin.r.kumar@ericsson.com
 rodo@rychlik.lounovice rodo@novell.com
 rodo@obluda.lounovice rodo@novell.com
 libo@rodolfo.eng.br rodolforg@gmail.com
@@ -406,7 +402,6 @@ sumuthu@suse.com sumuthu@collabora.com
 suokunlong@126.com suokunlong@gmail.com
 sushilshinde@libreoffice.com sushil.shinde@synerzip.com
 tabe-wfainkbuzdxhpplsxpa2lq@public.gmane.org tantai@osdev.co.th
-tk7ua1678@gmail.com tarun.k.kumar@ericsson.com
 thomas.benisch@oracle.com tbe@openoffice.org
 thorsten.bosbach@oracle.com tbo@openoffice.org
 tchvatal@suse.com tchvatal@novell.com
@@ -419,31 +414,35 @@ thb@thorstens-computer.local thb@openoffice.org
 thb@documentfoundation.org thb@openoffice.org
 tbehrens@suse.com thb@openoffice.org
 tbehrens@novell.com thb@openoffice.org
+eilidh.mcadam@gmail.com tibbylickle@gmail.com
+eilidh.mcadam@itomig.de tibbylickle@gmail.com
+tibbylickle@googlemail.com tibbylickle@gmail.com
 tietze.heiko@googlemail.com tietze.heiko@gmail.com
 tim.retout@smoothwall.net tim@retout.co.uk
 andras.timar@collabora.com timar@fsf.hu
 atimar@suse.com timar@fsf.hu
 timar@gnome.hu timar@fsf.hu
 atimar@novell.com timar@fsf.hu
+tarun.k.kumar@ericsson.com tk7ua1678@gmail.com
 thomas.lange@sun.com tl@openoffice.org
 thomas.lange@oracle.com tl@openoffice.org
-tml@hemulen.(none) tml@collabora.com
-tml@iki.fi tml@collabora.com
-tml@ifilifjonkan.site tml@collabora.com
-tml@novell.com tml@collabora.com
-tlillqvist@suse.com tml@collabora.com
-tlillqvist@novell.com tml@collabora.com
-tml@openoffice.org tml@collabora.com
-tml@filifjonkan.site tml@collabora.com
+tml@collabora.com tml@iki.fi
+tml@hemulen.(none) tml@iki.fi
+tml@ifilifjonkan.site tml@iki.fi
+tml@novell.com tml@iki.fi
+tlillqvist@suse.com tml@iki.fi
+tlillqvist@novell.com tml@iki.fi
+tml@openoffice.org tml@iki.fi
+tml@filifjonkan.site tml@iki.fi
 tomas.hlavaty@knowledgetools.de tom@logand.com
 libreoffice@troy.rollo.name troy@troy.rollo.name
 tushar@bende.synerzip.com tushar.bende@synerzip.com
 tv@beamnet.de tv.libreoffice@beamnet.de
 vakevk@gmail.com vakevk+libreoffice@gmail.com
-vmiklos@openoffice.org vmiklos@collabora.co.uk
-vmiklos@collabora.com vmiklos@collabora.co.uk
-vmiklos@suse.cz vmiklos@collabora.co.uk
-vmiklos@frugalware.org vmiklos@collabora.co.uk
+vmiklos@openoffice.org vmiklos@frugalware.org
+vmiklos@collabora.com vmiklos@frugalware.org
+vmiklos@suse.cz vmiklos@frugalware.org
+vmiklos@collabora.co.uk vmiklos@frugalware.org
 volker.ahrendt@sun.com volker.ahrendt@oracle.com
 va@openoffice.org volker.ahrendt@oracle.com
 swachhandl95@gmail.com wachhandl95@gmail.com
diff --git a/license-analyze.py b/license-analyze.py
index 8177bbd2..5015daa4 100755
--- a/license-analyze.py
+++ b/license-analyze.py
@@ -116,10 +116,12 @@ def load_domainmap(homeDir):
 def load_licensePersonal(homeDir):
     rawData = []
     fileName = homeDir + 'licensePersonal.csv'
+    orgText = []
     try:
         with open(fileName, 'r') as fp:
             for line in fp:
                 line = line[:-1]
+                orgText.append(line)
                 if line.startswith('#') or line.startswith(' ') or len(line) == 0:
                     continue
                 mail = line[:line.index(';')]
@@ -128,6 +130,11 @@ def load_licensePersonal(homeDir):
                 if mail in rawData:
                     print('>>> personalLicense.csv ' + mail + ' duplicate')
                 rawData.append(mail)
+        newText = sorted(orgText)
+        if newText != orgText:
+            with open(fileName, 'w') as fp:
+                for line in newText:
+                   print(line, file=fp)
     except Exception as e:
       print('Error load file ' + fileName + ' due to ' + str(e))
       rawData = None
diff --git a/licensePersonal.csv b/licensePersonal.csv
index ff5441c5..33eb20d6 100644
--- a/licensePersonal.csv
+++ b/licensePersonal.csv
@@ -2,6 +2,7 @@
 1st2be@gmail.com;Brown, Joseph;http://lists.freedesktop.org/archives/libreoffice/2012-August/037397.html
 2014ucp1524@mnit.ac.in;Nagar, Akshay;https://lists.freedesktop.org/archives/libreoffice/2016-October/075501.html
 2448848492@mail.ecc.u-tokyo.ac.jp;Kawamura, Keigo;http://lists.freedesktop.org/archives/libreoffice/2015-November/071055.html
+2robinsaini@gmail.com;Kumar, Robin;http://lists.freedesktop.org/archives/libreoffice/2014-June/061879.html
 6b8b4567@gmail.com;Dixon, Luke;http://lists.freedesktop.org/archives/libreoffice/2012-May/031552.html
 7ravikp@gmail.com;Prasad, Ravi Kumar;https://lists.freedesktop.org/archives/libreoffice/2016-September/075213.html
 aalabdulrazzaq@kacst.edu.sa;Al-Abdulrazzaq, Abdulmajeed;http://lists.freedesktop.org/archives/libreoffice/2012-July/035301.html
@@ -18,7 +19,7 @@ acdrferreira@gmail.com;Ferreira, Alberto;http://lists.freedesktop.org/archives/l
 adamkasztenny@gmail.com;Kasztenny, Adam;http://nabble.documentfoundation.org/License-statement-td4179584.html
 admin@jtlebi.fr;Le Bigot, Jean-Tiare;http://lists.freedesktop.org/archives/libreoffice/2012-July/035637.html
 adriendev84@gmail.com;Adrien;GIT AUTHOR 2013-08
-af@apache.org;Fischer, Andre;COMPANY LICENSE: APACHE
+af@a-w-f.de;Fischer, Andre;COMPANY LICENSE: APACHE
 affqlixo@gmail.com;Governatore, Fernando;http://lists.freedesktop.org/archives/libreoffice/2012-February/027130.html
 ageorgiopoulos@live.com;Georgiopoulos, Aristomenis;PENDING GIT AUTHOR 2015-10
 agomez@igalia.com;Gomez, Andres;http://lists.freedesktop.org/archives/libreoffice/2013-April/050153.html
@@ -76,7 +77,7 @@ apriyadarshi.1995@gmail.com;Priyadarshi, Apurva;https://lists.freedesktop.org/ar
 arekm@maven.pl;Miśkiewicz, Arkadiusz;http://lists.freedesktop.org/archives/libreoffice/2012-March/028319.html
 arfrever@apache.org;Arahesis, Arfrever Frehtes Taifersar;COMPANY LICENSE: APACHE
 arielch@apache.org;Constenla-Haile, Constenla-Haile;COMPANY LICENSE: APACHE
-armin.le.grand@cib.de;Le Grand, Armin;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
+armin.le.grand@me.com;Le Grand, Armin;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 armin@openoffice.org;Theissen, Armin; AUDIT GIT AUTHOR 2003-01
 arnaud.versini@gmail.com;Versini, Arnaud;http://lists.freedesktop.org/archives/libreoffice/2011-October/019988.html
 arnold@dumas.at;Dumas, Arnold;https://lists.freedesktop.org/archives/libreoffice/2016-February/073217.html
@@ -90,7 +91,6 @@ ashodnakashian@yahoo.com;Nakashian, Ashod;http://lists.freedesktop.org/archives/
 ashp.pandey916@gmail.com;Pandey, Abhishek ;https://lists.freedesktop.org/archives/libreoffice/2016-November/075995.html (MANUAL)
 asyropoulos@yahoo.com;Syropoulos, Apostolos;GIT AUTHOR 2014-05
 at.higginson@gmail.com;Higginson, Andrew;http://lists.freedesktop.org/archives/libreoffice/2012-April/029495.html
-timar@fsf.hu;Timar, Andras;http://lists.freedesktop.org/archives/libreoffice/2012-May/031049.html
 atishayjain708@gmail.com;Jain, Atishay;https://lists.freedesktop.org/archives/libreoffice/2016-November/076005.html
 audreyt@audreyt.org;Tang, Audrey;http://lists.freedesktop.org/archives/libreoffice/2014-August/062691.html CC0
 auerswal@unix-ag.uni-kl.de;Auerswald, Erik;GIT AUTHOR 2013-07
@@ -105,6 +105,7 @@ b.baabsi@gmail.com;Babati, Bence;http://lists.freedesktop.org/archives/libreoffi
 b.nazir@aposte.net;Billel, Nazir;https://lists.freedesktop.org/archives/libreoffice/2016-March/073799.html
 b7.10110111@gmail.com;Kabatsayev, Ruslan;http://lists.freedesktop.org/archives/libreoffice/2012-May/031877.html
 b900613@gmail.com;Yao, Lai Chen;https://lists.freedesktop.org/archives/libreoffice/2016-August/074992.html
+b_michaelsen@openoffice.org;Michaelsen, Björn;http://lists.freedesktop.org/archives/libreoffice/2011-November/020761.html
 babelstone@gmail.com;West, Andrew;http://lists.freedesktop.org/archives/libreoffice/2012-May/031829.html
 babiakr3@mymail.macewan.ca;Babiak, robert;GIT AUTHOR 2015-03
 bagyi_barnabas@yahoo.com;Bágyi, Barnabás;https://lists.freedesktop.org/archives/libreoffice/2016-December/076105.html
@@ -131,7 +132,6 @@ bertrand.lorentz@gmail.com;Lorentz, Bertrand;http://lists.freedesktop.org/archiv
 bezawit_moges@berea.edu;Moges, Beza;https://lists.freedesktop.org/archives/libreoffice/2016-March/073909.html
 bionic@centrum.cz;Smrž, Ondřej;GIT AUTHOR 2014-01
 bisal.nayal@synerzip.com;Bisal Nayal;COMPANY LICENSE: Synerzip
-b_michaelsen@openoffice.org;Michaelsen, Björn;http://lists.freedesktop.org/archives/libreoffice/2011-November/020761.html
 blecha.jiri@gmail.com;Blecha, Jiří;http://lists.freedesktop.org/archives/libreoffice/2013-March/047002.html
 bluedwarf@bpost.plala.org.jp;Nakamoto, Takashi;http://lists.freedesktop.org/archives/libreoffice/2011-August/017426.html
 bmahbod@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
@@ -145,6 +145,7 @@ brennanv@email.arizona.edu;Vincent, Brennan;http://lists.freedesktop.org/archive
 brentritztro96@gmail.com;Ritzema, Brent;http://lists.freedesktop.org/archives/libreoffice/2015-April/067559.html
 brutus@free.fr;Fournier, Alexandre;http://lists.freedesktop.org/archives/libreoffice/2012-May/031864.html
 btomi96@gmail.com;Tamás, Bunth;https://lists.freedesktop.org/archives/libreoffice/2016-March/073518.html
+bubli@bubli.org;Behrens, Katarína;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 bubstakker@gmail.com;"Merda, Marcin ""exine""";http://lists.freedesktop.org/archives/libreoffice/2012-May/031262.html
 bugs@traviswcarter.com;Carter, Travis;http://lists.freedesktop.org/archives/libreoffice/2012-June/034127.html
 burant.j@seznam.cz;Burant, Jiri;https://lists.freedesktop.org/archives/libreoffice/2016-April/073970.html
@@ -153,13 +154,13 @@ cabral@mandriva.com.br;Cabral, Rafael;http://lists.freedesktop.org/archives/libr
 call.protected@gmail.com;D., Mathieu;http://lists.freedesktop.org/archives/libreoffice/2012-November/041142.html
 camille.moulin@free.fr;Moulin, Camille;http://lists.freedesktop.org/archives/libreoffice/2012-May/031771.html
 cao.cuong.ngo@gmail.com;Ngo, Cao Cuong;http://lists.freedesktop.org/archives/libreoffice/2013-March/046989.html
-cmc@openoffice.org;McNamara, Caolán;COMPANY LICENSE: RedHat
 castarco@gmail.com;Correa Casablanca, Andreu;http://lists.freedesktop.org/archives/libreoffice/2011-September/018150.html
 cavemancarl11@gmail.com;Taylor, Carl;http://lists.freedesktop.org/archives/libreoffice/2011-December/022815.html
 ccheney@ubuntu.com;Cheney, Chris;GIT AUTHOR 2012-10
 ccsheller@gmail.com;ccsheller;PENDING GIT AUTHOR 2015-11
 cdan@savatech.ro;Corneanu, Dan;http://lists.freedesktop.org/archives/libreoffice/2012-May/031843.html
 cedric.bosdonnat.ooo@free.fr;Bosdonnat, Cédric;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
+cedricbosdo@openoffice.org;Bosdo, Cedric;AUDIT GIT AUTHOR 2009-10
 ch.ko123@gmail.com;Koppelt, Christine;http://lists.freedesktop.org/archives/libreoffice/2012-December/042028.html
 chaitanya7991@gmail.com;Krishnan, H.Chaithanyal;http://lists.freedesktop.org/archives/libreoffice/2016-January/072001.html
 chamow97@hotmail.com;J, Chandramowli;https://lists.freedesktop.org/archives/libreoffice/2016-December/076053.html
@@ -174,16 +175,17 @@ christian.dywan@lanedo.com;Dywan, Christian;http://lists.freedesktop.org/archive
 christian.heller63@gmail.com;Heller, Christian;http://lists.freedesktop.org/archives/libreoffice/2013-February/046616.html
 christianjunker@gmail.com;Junker, Christian;http://lists.freedesktop.org/archives/libreoffice/2014-February/059485.html
 christoph-schaefer@gmx.de;Schäfe,r Christoph;https://lists.freedesktop.org/archives/libreoffice/2016-December/076339.html
-christoph.lutz_ml@cib.de;Lutz, Christoph;http://lists.freedesktop.org/archives/libreoffice/2011-September/017788.html
 christoph@dogmatux.com;Noack, Christoph;http://lists.freedesktop.org/archives/libreoffice/2012-May/031316.html
 christophe.jaillet@wanadoo.fr;Jaillet, Christophe;http://lists.freedesktop.org/archives/libreoffice/2012-June/033488.html
 christopher.hotchkiss@gmail.com;Hotchkiss, Christopher;http://lists.freedesktop.org/archives/libreoffice/2013-February/046048.html
+chrlutz@googlemail.com;Lutz, Christoph;http://lists.freedesktop.org/archives/libreoffice/2011-September/017788.html
 chrrossmanith@gmx.de;Roßmanith, Christina;http://lists.freedesktop.org/archives/libreoffice/2012-March/027419.html
 chudugama@gmail.com;Udugama, Chamal;https://lists.freedesktop.org/archives/libreoffice/2016-September/075210.html
 cl@openoffice.org;Christian Lippka;COMPANY LICENSE: Openoffice
 clarence_guo@apache.org;Guo, Clarence;COMPANY LICENSE: APACHE
 clement@lassieur.org;Lassieur, Clément;http://lists.freedesktop.org/archives/libreoffice/2014-December/065403.html
-cloph@floyd.documentfoundation.org;Christian Lohmaier;COMPANY LICENSE: DocumentFoundation
+cloph@openoffice.org;Christian Lohmaier;COMPANY LICENSE: DocumentFoundation
+cmc@openoffice.org;McNamara, Caolán;COMPANY LICENSE: RedHat
 cmkmanwani@gmail.com;Manwani, Chirag;https://lists.freedesktop.org/archives/libreoffice/2016-February/073256.html
 cniehaus@gmx.de;Niehaus, Carsten;http://lists.freedesktop.org/archives/libreoffice/2012-May/031413.html
 cocofan@mailbolt.com;Dona Hertel;AUDIT: mailed legal list
@@ -268,6 +270,7 @@ dsteele@gmail.com;Steele, Dave;http://lists.freedesktop.org/archives/libreoffice
 dtardon@redhat.com;Tardon, David;https://lists.freedesktop.org/archives/libreoffice/2016-April/073971.html
 duan19002009@gmail.com;Duan, Xiaoli;http://lists.freedesktop.org/archives/libreoffice/2013-March/048367.html
 dubeysandeep.in@gmail.com;Dubey, Sandeep;https://lists.freedesktop.org/archives/libreoffice/2016-December/076192.html
+duerr@de.ibm.com;Dürr, Herbert;COMPANY LICENSE: APACHE
 dumont.marcantoine13@gmail.com;Dumont, Marc Antoine;https://lists.freedesktop.org/archives/libreoffice/2016-October/075631.html
 dushyant.bhalgami@synerzip.com;Dushyant Bhalgami;COMPANY LICENSE: Synerzip
 dverrier@gmail.com;Verrier, David;http://lists.freedesktop.org/archives/libreoffice/2013-February/046630.html
@@ -281,7 +284,6 @@ edmund.laugasson@gmail.com;Laugasson, Edmund;GIT AUTHOR 2015-01
 efeyalaman@gmail.com;YALAMAN, Efe Gürkan;http://lists.freedesktop.org/archives/libreoffice/2012-August/036186.html
 egore911@gmail.com;Brill, Christoph;https://lists.freedesktop.org/archives/libreoffice/2016-February/072835.html
 egorov@linux.com;Egorov, Boris;http://lists.freedesktop.org/archives/libreoffice/2014-September/063203.html
-eilidh.mcadam@gmail.com;McAdam, Eilidh;http://lists.freedesktop.org/archives/libreoffice/2012-May/031880.html
 ejrsfnm4@yahoo.com;Derrick, Rocha;GIT AUTHOR 2015-08
 elianoss@gmail.com;Jinoch, Vlastimil;http://lists.freedesktop.org/archives/libreoffice/2013-April/049892.html
 elie.roux@telecom-bretagne.eu;Roux, Elie;http://lists.freedesktop.org/archives/libreoffice/2014-June/061711.html
@@ -291,7 +293,7 @@ emmanuel.peyrot@collabora.com;Emmanuel Gil Peyrot;COMPANY LICENSE: Collabora
 enes@enesates.com;Ateş, Enes;http://lists.freedesktop.org/archives/libreoffice/2015-March/067137.html
 enrico.weigelt@vnc.biz;Weigelt, Enrico;http://lists.freedesktop.org/archives/libreoffice/2012-November/041198.html
 er.yogeshdesai@gmail.com;Desai, Yogesh;http://lists.freedesktop.org/archives/libreoffice/2016-January/071707.html
-erack@redhat.com;Rathke, Eike;http://lists.freedesktop.org/archives/libreoffice/2011-July/015777.html
+er@openoffice.org;Rathke, Eike;http://lists.freedesktop.org/archives/libreoffice/2011-July/015777.html
 erdemdemirkapi.1995@gmail.com;Demirkapi, Erdem;http://lists.freedesktop.org/archives/libreoffice/2016-January/072396.html
 eric@seynaeve.be;Seynaeve, Eric;http://lists.freedesktop.org/archives/libreoffice/2013-February/045508.html
 ericb2@apache.org;ericb2;COMPANY LICENSE: APACHE
@@ -300,6 +302,7 @@ esr@thyrsus.com;Raymond, Eric S.;http://lists.freedesktop.org/archives/libreoffi
 eszkadev@gmail.com;Kłos, Szymon;http://lists.freedesktop.org/archives/libreoffice/2014-March/060060.html
 evfool@gmail.com;Roth, Robert;http://lists.freedesktop.org/archives/libreoffice/2012-May/031477.html
 ew@crazy-cat.org;Wong, Ed;https://lists.freedesktop.org/archives/libreoffice/2016-December/076393.html
+eymux2009@googlemail.com;?;AUDIT GIT NONE
 f.alexander.wilms@gmail.com;Wilms, Alexander;http://lists.freedesktop.org/archives/libreoffice/2012-May/031585.html
 f.allmann-rahn@gmx.de;Allmann-Rahn, Florian;http://lists.freedesktop.org/archives/libreoffice/2012-April/030141.html
 fabio.biocchetti@gmail.com;Biocchetti, Fabio;https://lists.freedesktop.org/archives/libreoffice/2016-October/075601.html
@@ -308,6 +311,7 @@ fakabbir@gmail.com;Amin, Fakabbir;https://lists.freedesktop.org/archives/libreof
 farago.janos@andrews.hu;Farago, Janos;http://lists.freedesktop.org/archives/libreoffice/2013-September/055644.html
 farakuzun@mail.com;Uzun, Faruk;http://lists.freedesktop.org/archives/libreoffice/2015-November/071259.html
 fastakash@gmail.com;Deshpande, Akash;https://lists.freedesktop.org/archives/libreoffice/2016-May/074240.html
+federico@ximian.com;Federico;AUDIT GIT NONE
 fengzeng@multicorewareinc.com;fengzeng;COMPANY LICENSE: MultiCoreWare
 feremp.i+lodev@gmail.com;Pirani, Fernando;http://lists.freedesktop.org/archives/libreoffice/2015-August/069571.html
 fernando+libreoffice@trankil.info;Lagrange, J. Fernando;http://lists.freedesktop.org/archives/libreoffice/2014-February/059298.html
@@ -411,7 +415,6 @@ hauf.johannes@gmail.com;Hauf, Johannes;http://lists.freedesktop.org/archives/lib
 havlicek.honza@gmail.com;Havlíček, Jan;http://lists.freedesktop.org/archives/libreoffice/2014-February/059328.html
 hcvcastro@gmail.com;Castro, Henry;http://lists.freedesktop.org/archives/libreoffice/2014-December/065473.html
 hdlyhne1@gmail.com;Lyhne, Hannah;http://lists.freedesktop.org/archives/libreoffice/2014-April/060388.html
-hdu@apache.org;Dürr, Herbert;COMPANY LICENSE: APACHE
 heinzlesspam@gmail.com;Knorr, Stefan;http://lists.freedesktop.org/archives/libreoffice/2011-November/021386.html
 hel.svo@gmail.com;Svobodová, Helena;https://lists.freedesktop.org/archives/libreoffice/2016-May/074268.html
 hemmerling@gmx.net;Hemmerling, Rolf;http://lists.freedesktop.org/archives/libreoffice/attachments/20130616/4f4166e2/attachment-0001.html
@@ -503,6 +506,7 @@ joachim.tremouroux@gmail.com;Trémouroux, Joachim;http://lists.freedesktop.org/a
 joan@montane.cat;Montane, Joan;GIT AUTHOR 2014-04
 jody@novell.com;????;COMPANY LICENSE: SUSE
 joerg@netbsd.org;Sonnenberger, Jörg;GIT AUTHOR 2014-08
+jogischmidt@googlemail.com;Schmidt, Jürgen;COMPANY LICENSE: APACHE
 johann.messner@jku.at;Messner, Johann;http://lists.freedesktop.org/archives/libreoffice/2012-August/037530.html
 johannes@sipsolutions.net;Berg, Johannes;https://lists.freedesktop.org/archives/libreoffice/2016-August/074912.html
 john.marmion@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
@@ -523,7 +527,6 @@ jr@jriddell.org;Riddell, Jonathan;http://lists.freedesktop.org/archives/libreoff
 jr@natural-computing.de;Rahemipour, Jacqueline;http://lists.freedesktop.org/archives/libreoffice/2013-March/048799.html
 jrb@redhat.com;Blandford, Jonathan;http://lists.freedesktop.org/archives/libreoffice/2012-April/031021.html
 jrtc27@jrtc27.com;Clarke, James;https://lists.freedesktop.org/archives/libreoffice/2016-August/074928.html
-jsc@apache.org;Schmidt, Jürgen;COMPANY LICENSE: APACHE
 jseward@acm.org;Seward, Julian;http://lists.freedesktop.org/archives/libreoffice/2012-March/028236.html
 jsk@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 jsnhulme@gmail.com;Hulme, Jason;http://lists.freedesktop.org/archives/libreoffice/2013-July/053960.html
@@ -549,14 +552,13 @@ kano@rim.or.jp;Okano, Takayoshi;http://lists.freedesktop.org/archives/libreoffic
 kaplanlior@gmail.com;Kaplan, Lior;http://lists.freedesktop.org/archives/libreoffice/2011-November/020120.html
 karthickindian2011@gmail.com;Gunasekaran, Karthick Prasad;GIT AUTHOR 2015-03
 karthikeyan@kacst.edu.sa;Karthikeyan, K;GIT AUTHOR 2013-04
-katarina.behrens@cib.de;Behrens, Katarína;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 katherine.goss@gmail.com;Goss, Kate;http://lists.freedesktop.org/archives/libreoffice/2012-February/025938.html
 kb9vqf@pearsoncomputing.net;Pearson, Timothy;http://lists.freedesktop.org/archives/libreoffice/2012-May/031767.html
 keithcoder@gmail.com;McRae, Keith;http://lists.freedesktop.org/archives/libreoffice/2012-May/031552.html
 keithcu@gmail.com;Curtis, Keith;http://lists.freedesktop.org/archives/libreoffice/2013-December/058345.html
 kelemeng@ubuntu.com;Kelemen, Gabor;http://lists.freedesktop.org/archives/libreoffice/2013-June/053610.html
 kenbiondi@hotmail.com;Biondi, Ken;GIT AUTHOR 2014-05
-kendy@suse.cz;Holešovský, Jan;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
+kendy@notthere.aliasdomain.foo;Holešovský, Jan;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 kenneth.venken@gmail.com;Kenneth Venken;AUDIT: mailed legal list
 kenneth_lists@aafloy.net;Aafløy, Kenneth;AUDIT: WIKI no mail ref.
 kevin.hausmann@gmail.com;Hausmann, Kevin;http://lists.freedesktop.org/archives/libreoffice/2012-September/038114.html
@@ -572,6 +574,7 @@ kishorbhat@gmail.com;Bhat, Kishor;http://lists.freedesktop.org/archives/libreoff
 kkemenczy@gmail.com;Kéménczy, Kálmán;http://lists.freedesktop.org/archives/libreoffice/2012-May/031074.html
 klasse@partyheld.de;Johnny_M;https://lists.freedesktop.org/archives/libreoffice/2016-May/074231.html
 koehlerkarl@comcast.net;Karl Koehler;AUDIT: mailed legal list
+kohei@openoffice.org;Yoshida, Kohei;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 konya.vic@gmail.com;Lee, Victor;http://lists.freedesktop.org/archives/libreoffice/2012-April/030523.html
 koukal.vojta@gmail.com;Koukal, Vojta;GIT AUTHOR 2013-03
 kpengboy@fastmail.fm;Peng, Kevin;http://lists.freedesktop.org/archives/libreoffice/2012-July/035519.html
@@ -606,7 +609,6 @@ lgodard.libre@laposte.net;Godard, Laurent;http://lists.freedesktop.org/archives/
 libo@bobiciel.com;Dargaud, Robert;http://lists.freedesktop.org/archives/libreoffice/2012-May/031816.html
 libo@pechlaner.at;Pechlaner, Wolfgang;http://lists.freedesktop.org/archives/libreoffice/2011-September/017854.html
 libreoffice@bielefeldundbuss.de;Bielefeld, Rainer;http://lists.freedesktop.org/archives/libreoffice/2013-April/050600.html
-libreoffice@kohei.us;Yoshida, Kohei;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 libreoffice@stevehart.net;Hart, Steven;http://lists.freedesktop.org/archives/libreoffice/2015-August/069681.html
 lijiany@apache.org;Li, Jianyuan;COMPANY LICENSE: APACHE
 limjing7@gmail.com;Jing, Lim;http://lists.freedesktop.org/archives/libreoffice/2014-September/063292.html
@@ -640,6 +642,7 @@ maand@gmx.de;Mantke, Andreas;http://lists.freedesktop.org/archives/libreoffice/2
 maba@mb-systemhaus.net;Bayreuther, Martin;https://lists.freedesktop.org/archives/libreoffice/2016-April/073960.html
 machniak@kolabsys.com;Machniak, Aleksander;https://lists.freedesktop.org/archives/libreoffice/2016-October/075580.html
 maciej.rumianowski@gmail.com;Rumianowski, Maciej;http://lists.freedesktop.org/archives/libreoffice/2011-July/015266.html
+madewokherd@gmail.com;Povirk, Vincent;AUDIT GIT AUTHOR 2011-12
 magomez@igalia.com;Gomez, Miguel;http://lists.freedesktop.org/archives/libreoffice/2013-April/050153.html
 mahfiaz@gmail.com;Põldaru, Matias;http://lists.freedesktop.org/archives/libreoffice/2014-December/065131.html
 maier@fs.ei.tum.de;Maier, Markus;http://lists.freedesktop.org/archives/libreoffice/2012-November/041613.html
@@ -700,6 +703,7 @@ mav@openoffice.org;Mikhail Voytenko;COMPANY LICENSE: Openoffice
 maxim.darak@gmail.com;Darak, Maxim;http://lists.freedesktop.org/archives/libreoffice/2013-January/044887.html
 mayongl@apache.org;Ma, Yong Lin;COMPANY LICENSE: APACHE
 mazelm@gmail.com;M., Mirek;http://lists.freedesktop.org/archives/libreoffice/2012-June/032855.html
+mba@openoffice.org;Bauer, Mathias;AUDIT GIT AUTHOR 2010-07
 mbechler@eenterphace.org;Bechler, Moritz;http://lists.freedesktop.org/archives/libreoffice/2011-December/021925.html
 mcmurchy1917-libreoffice@yahoo.co.uk;Kempshall, Alex;https://lists.freedesktop.org/archives/libreoffice/2016-December/076117.html
 mcrha@redhat.com;Milan Crha;COMPANY LICENSE: RedHat
@@ -717,8 +721,6 @@ mevs2000@gmail.com;Sharma, Sharma;https://lists.freedesktop.org/archives/libreof
 mhaggag@gmail.com;Haggag, Muhammad;GIT AUTHOR 2012-11
 mhu@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 mi84aa@gmail.com;Szathmáry, Péter;GIT AUTHOR 2015-01
-michael.meeks@suse.com;Meeks, Michael;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
-michael.natterer@lanedo.com;Natterer, Michael;COMPANY LICENSE: Lanedo (MANUAL)
 michael.w.dunphy@gmail.com;Dunphy, Michael;http://lists.freedesktop.org/archives/libreoffice/2013-April/050307.html
 michael@codingmicha.de;Münch, Michael;http://lists.freedesktop.org/archives/libreoffice/2012-May/031677.html
 michal.siedlaczek@gmail.com;Siedlaczek, Michał;http://lists.freedesktop.org/archives/libreoffice/2014-May/061006.html
@@ -739,12 +741,14 @@ minarja4@gmail.com;Minarik, Honza;http://lists.freedesktop.org/archives/libreoff
 mingli@multicorewareinc.com;mingli;COMPANY LICENSE: MultiCoreWare
 minhthucdao1@gmail.com;Thuc, Dao Minh;https://lists.freedesktop.org/archives/libreoffice/2016-May/074142.html
 mirco.rondini@yahoo.it;Rondini, Mirco;https://lists.freedesktop.org/archives/libreoffice/2016-October/075474.html
+mitch@gimp.org;Natterer, Michael;COMPANY LICENSE: Lanedo (MANUAL)
 mjay.francis@gmail.com;Francis, Matthew;http://lists.freedesktop.org/archives/libreoffice/2014-August/063000.html
 mkbosmans@gmail.com;Bosmans, Maarten;https://lists.freedesktop.org/archives/libreoffice/2016-August/075081.html
 mkubecek@suse.cz;Michal Kubecek;COMPANY LICENSE: SUSE
 mliska@suse.cz;Martin Liška;COMPANY LICENSE: SUSE
 mloiseleur@linagora.com;*UNKNOWN*;COMPANY LICENSE: Linagora
 mmathias.supp@vector.com;Supp, Mathias;http://lists.freedesktop.org/archives/libreoffice/2014-March/060348.html
+mmeeks@openoffice.org;Meeks, Michael;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 mmetz@adrian-broher.net;Metz, Marcel;http://lists.freedesktop.org/archives/libreoffice/2011-December/021654.html
 modestas.rimkus@gmail.com;Rimkus, Modestas;http://listarchives.libreoffice.org/global/l10n/msg04524.html
 momonasmon@gmail.com;Monastirsky, Maxim;http://lists.freedesktop.org/archives/libreoffice/2013-October/057032.html
@@ -757,14 +761,14 @@ mrcekets@gmail.com;Cecchetti, Marco;http://lists.freedesktop.org/archives/libreo
 mridulgupta9@gmail.com;Gupta, Mridul;http://lists.freedesktop.org/archives/libreoffice/2015-March/066903.html
 mrugiero@gmail.com;Rugiero, Mario;http://lists.freedesktop.org/archives/libreoffice/2015-October/070736.html
 mshinke@users.sourceforge.jp;Shinke, Masataka;GIT AUTHOR 2012-02
-mstahl@redhat.com;Stahl, Michael;http://lists.freedesktop.org/archives/libreoffice/2011-September/018134.html
+mst@openoffice.org;Stahl, Michael;http://lists.freedesktop.org/archives/libreoffice/2011-September/018134.html
 msvec@novell.com;*UNKNOWN*;COMPANY LICENSE: SUSE
 mt@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 mtg@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 muhammet.kara@pardus.org.tr;Kara, Muhammet;https://lists.freedesktop.org/archives/libreoffice/2016-March/073795.html
 mulei@multicorewareinc.com;mulei;COMPANY LICENSE: MultiCoreWare
 murrayc@openismus.com;Cumming, Murray;http://lists.freedesktop.org/archives/libreoffice/2013-March/048202.html
-muthu.subramanian.karunanidhi@ericsson.com;Subramanian, Muthu;http://lists.freedesktop.org/archives/libreoffice/2012-February/027172.html
+muthusuba@gmail.com;Subramanian, Muthu;http://lists.freedesktop.org/archives/libreoffice/2012-February/027172.html
 myaddons@gmx.de;Bergmann, Alexander;http://lists.freedesktop.org/archives/libreoffice/2012-January/023958.html
 myromeu@ya.ru;Ivan, Apachev;https://lists.freedesktop.org/archives/libreoffice/2016-November/075748.html
 mzasuwik@gmail.com;Zasuwik, Mateusz;http://lists.freedesktop.org/archives/libreoffice/2012-May/032180.html
@@ -789,28 +793,27 @@ nifgraup@gmail.com;Ragnarsson, Björgvin;http://lists.freedesktop.org/archives/l
 nikhil.walvekar@synerzip.com;Walvekar, Nikhil;http://lists.freedesktop.org/archives/libreoffice/2013-December/058133.html
 nlminhtl@gmail.com;Ngo, Minh;http://lists.freedesktop.org/archives/libreoffice/2013-May/051422.html
 nn@openoffice.org;Niklas Nebel;COMPANY LICENSE: Openoffice
-noel.power@novell.com;Power, Noel;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
-noel@peralex.com;Grandin, Noel;http://lists.freedesktop.org/archives/libreoffice/2012-February/025634.html
+noelgrandin@gmail.com;Grandin, Noel;http://lists.freedesktop.org/archives/libreoffice/2012-February/025634.html
 nogajun@gmail.com;NOGATA, Jun;GIT AUTHOR 2015-01
 noseeba1@gmail.com;kindi, noseeba Al;https://lists.freedesktop.org/archives/libreoffice/2016-April/073978.html
 nourah.alshoeibi@gmail.com;Shoeibi, Nourah Al;GIT AUTHOR 2013-07
+npower@openoffice.org;Power, Noel;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 nrbrtx@gmail.com;Norbert X;http://lists.freedesktop.org/archives/libreoffice/2014-June/061800.html
 nthiebaud@gmail.com;Thiebaud, Norbert;http://lists.freedesktop.org/archives/libreoffice/2011-August/017246.html
 nurhakaltin@gmail.com;Altin, Nurhak;http://lists.freedesktop.org/archives/libreoffice/2016-January/072397.html
 nuts@mawoh.de;Nuessle, Matthias;GIT COMMITTER 2013-07
 ny.nathan.yee@gmail.com;Yee, Nathan;http://lists.freedesktop.org/archives/libreoffice/2015-March/067212.html
 oc@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
-ocke.janssen@oracle.com;Ocke Janssen [oj];COMPANY LICENSE: Oracle
-oj@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
+oj@openoffice.org;Janssen, Ocke;COMPANY LICENSE: Openoffice
 oliver.brinzing@gmx.de;Brinzing, Oliver;http://lists.freedesktop.org/archives/libreoffice/2015-August/069896.html
-os@openoffice.org;Specht, Oliver;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
-olivier.hallot@edxsrv.br;Hallot, Olivier;http://lists.freedesktop.org/archives/libreoffice/2011-November/020544.html
+olivier.hallot@edx.srv.br;Hallot, Olivier;http://lists.freedesktop.org/archives/libreoffice/2011-November/020544.html
 olivier.noreply@gmail.com;Olivier, R;GIT AUTHOR 2015-09
 olivier.ploton@univ-tours.fr;Ploton, Olivier;http://lists.freedesktop.org/archives/libreoffice/2012-December/042156.html
 oolst@nouenoff.nl;Nouws, Cor;http://lists.freedesktop.org/archives/libreoffice/2011-November/020932.html
 openoffice@schierla.de;Schierl, Andreas;GIT AUTHOR 2012-01
 orcmid@apache.org;Hamilton, Dennis E.;COMPANY LICENSE: APACHE
-orw@apache.org;Wittmann, Oliver-Rainer;COMPANY LICENSE: APACHE
+orwittmann@googlemail.com;Wittmann, Oliver-Rainer;COMPANY LICENSE: APACHE
+os@openoffice.org;Specht, Oliver;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 osmman@gmail.com;Turek, Tomáš;http://lists.freedesktop.org/archives/libreoffice/2013-March/048441.html
 otte@redhat.com;Benjamin Otte;COMPANY LICENSE: RedHat
 otto@seravo.fi;Kekäläinen, Otto;https://lists.freedesktop.org/archives/libreoffice/2016-October/075651.html
@@ -850,7 +853,6 @@ pharic.15@gmail.com;Pulagam, Harichandan;http://lists.freedesktop.org/archives/l
 phil.jung@free.fr;Jung, Philippe;http://lists.freedesktop.org/archives/libreoffice/2015-April/067781.html
 phil@thenexusproject.org;Bordelon, Phil;http://lists.freedesktop.org/archives/libreoffice/2012-May/031573.html
 philipp.kloke@web.de;Kloke, Philipp;http://lists.freedesktop.org/archives/libreoffice/2012-May/031997.html
-philipp.lohmann@oracle.com;Lohmann, Philipp;COMPANY LICENSE: Oracle
 philipz85@hotmail.com;Philips, Yousuf;http://lists.freedesktop.org/archives/libreoffice/2014-September/063452.html
 phillip.szelat@gmail.com;Szelat, Phillip;http://lists.freedesktop.org/archives/libreoffice/2015-March/067287.html
 phora.public@outlook.com;Paraiso, Joan;http://lists.freedesktop.org/archives/libreoffice/2015-September/070345.html
@@ -864,7 +866,7 @@ pjacquod@alumni.ethz.ch;Jacquod, Pierre-André;http://lists.freedesktop.org/arch
 pjotr@guineapics.de;Jentsch, Peter;http://lists.freedesktop.org/archives/libreoffice/2012-May/031560.html
 pkacer@suse.com;Pavel Kacer;COMPANY LICENSE: SUSE
 pkoroau@gmail.com;Pkoroau;http://lists.freedesktop.org/archives/libreoffice/2012-November/041801.html
-pl@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
+pl@openoffice.org;Lohmann, Philipp;COMPANY LICENSE: Openoffice
 pliao@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 pluby@neooffice.org;Luby, Patrick;http://lists.freedesktop.org/archives/libreoffice/2015-October/070432.html
 pmladek@suse.cz;Mladek, Petr;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
@@ -925,7 +927,6 @@ robert.rcampbell@gmail.com;Campbell, Robert M;http://lists.freedesktop.org/archi
 robert.sedak@sk.t-com.hr;Sedak, Robert;http://lists.freedesktop.org/archives/libreoffice/2012-May/032523.html
 robert@multicorewareinc.com ;Hedges, Robert;http://lists.freedesktop.org/archives/libreoffice/2013-May/052680.html
 robert@openbsd.org;Nagy, Robert;http://lists.freedesktop.org/archives/libreoffice/2012-March/028407.html
-robin.r.kumar@ericsson.com;Kumar, Robin;http://lists.freedesktop.org/archives/libreoffice/2014-June/061879.html
 rodo@novell.com;Radek Doulik;COMPANY LICENSE: SUSE
 rodolforg@gmail.com;Gomes, Rodolfo Ribeiro;http://lists.freedesktop.org/archives/libreoffice/2012-December/043005.html
 rohankanojia420@gmail.com;Kumar, Rohan;http://lists.freedesktop.org/archives/libreoffice/2016-February/072595.html
@@ -1049,7 +1050,6 @@ taken.spc@gmail.com;Kurosawa, Takeshi;http://lists.freedesktop.org/archives/libr
 tamsajama@gmail.com;Tamsil, Amani;https://lists.freedesktop.org/archives/libreoffice/2016-October/075503.html
 tantai@osdev.co.th;Thanakanok, Tantai;http://lists.freedesktop.org/archives/libreoffice/2011-September/018519.html
 tapanprakasht@gmail.com;Prakasht, Tapan;http://lists.freedesktop.org/archives/libreoffice/2015-March/067377.html
-tarun.k.kumar@ericsson.com;Kumar, Tarun;http://lists.freedesktop.org/archives/libreoffice/2014-February/059686.html
 tatung2112@gmail.com;Duc, Tung Ta;http://lists.freedesktop.org/archives/libreoffice/2012-May/032434.html
 tbe@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 tbo@openoffice.org;Bosbach, Thorsten;COMPANY LICENSE: Openoffice
@@ -1061,6 +1061,7 @@ tentlexs@web.de;Ullrich, Pascal;http://lists.freedesktop.org/archives/libreoffic
 tgulacsi78@gmail.com;Gulácsi, Tamás;https://lists.freedesktop.org/archives/libreoffice/2016-November/075816.html
 thabetx@gmail.com;Thabet, Mohamed;https://lists.freedesktop.org/archives/libreoffice/2016-March/073722.html
 thardeck@suse.com;Tim Hardeck;COMPANY LICENSE: SUSE
+thb@openoffice.org;Behrens, Thorsten;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 thegalaxiasgroup@gmail.com;Accoleyen, Simon Van;PENDING GIT AUTHOR 2016-09
 theo.van.klaveren@gmail.com;van Klaveren, Theo;http://lists.freedesktop.org/archives/libreoffice/2012-May/031486.html
 theonewithideas@gmail.com;Stefanović, Aleksandar;https://lists.freedesktop.org/archives/libreoffice/2016-April/073973.html
@@ -1070,25 +1071,27 @@ thiespierdola@gmail.com;Pierdola, Thies;http://lists.freedesktop.org/archives/li
 thomas@arnhold.org;Arnhold, Thomas;http://lists.freedesktop.org/archives/libreoffice/2012-May/031050.html
 thomas@jorca.nl;van der Meulen, Thomas;http://lists.freedesktop.org/archives/libreoffice/2013-April/049166.html
 thomas@sarlandie.net;Sarlandie, Thomas;GIT AUTHOR 2015-01
-thb@openoffice.org;Behrens, Thorsten;http://lists.freedesktop.org/archives/libreoffice/2014-September/063472.html
 thorsten.wagner.4@gmail.com;Wagner, Thorsten;http://lists.freedesktop.org/archives/libreoffice/2015-April/067759.html
 tiagofsantos81@sapo.pt;Santos Tiago;https://lists.freedesktop.org/archives/libreoffice/2016-August/075079.html
 tianyao@multicorewareinc.com;tianyao;COMPANY LICENSE: MultiCoreWare
+tibbylickle@gmail.com;McAdam, Eilidh;http://lists.freedesktop.org/archives/libreoffice/2012-May/031880.html
 tietze.heiko@gmail.com;Tietze, Heiko;https://lists.freedesktop.org/archives/libreoffice/2016-October/075663.html
 tim.janik@lanedo.com;Janik, Tim;http://lists.freedesktop.org/archives/libreoffice/2012-August/036615.html
 tim.muller@collabora.co.uk;Tim-Philipp Müller;COMPANY LICENSE: Collabora
 tim@retout.co.uk;Retout, Tim;http://lists.freedesktop.org/archives/libreoffice/2010-October/001719.html
 tim@tim-richardson.net;Richardson, Tim;http://lists.freedesktop.org/archives/libreoffice/2013-June/052912.html
 tim_eves@sil.org;Eves, Tim;PENDING GIT AUTHOR 2016-05
+timar@fsf.hu;Timar, Andras;http://lists.freedesktop.org/archives/libreoffice/2012-May/031049.html
 timofeev.i.s@gmail.com;Timofeev, Ivan;http://lists.freedesktop.org/archives/libreoffice/2011-September/018420.html
 timotheecisnard@gmail.com;Isnard, Timothée;http://lists.freedesktop.org/archives/libreoffice/2015-August/069644.html
 timothy@eastlincoln.net;Magee, Timothy;https://lists.freedesktop.org/archives/libreoffice/2016-April/074043.html
 tinaacchione@gmail.com;Acchione, Christina;https://lists.freedesktop.org/archives/libreoffice/2016-November/075915.html (MANUAL)
 tinderbox@mel.suse.cz;tinderbox;COMPANY LICENSE: SUSE
+tk7ua1678@gmail.com;Kumar, Tarun;http://lists.freedesktop.org/archives/libreoffice/2014-February/059686.html
 tl@openoffice.org;*UNKNOWN*;COMPANY LICENSE: Openoffice
 tmacalp@gmail.com;MacAlpine, Trent;http://lists.freedesktop.org/archives/libreoffice/2014-March/059849.html
 tmarkle7@gmail.com;Markle, Timothy;http://lists.freedesktop.org/archives/libreoffice/2014-February/059433.html
-tml@collabora.com;Lillqvist, Tor;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
+tml@iki.fi;Lillqvist, Tor;http://lists.freedesktop.org/archives/libreoffice/2011-October/019659.html
 tobias.madl.dev@gmail.com;Madl, Tobias;http://lists.freedesktop.org/archives/libreoffice/2014-September/063116.html
 tobiasmue@gnome.org;Mueller, Tobias;http://lists.freedesktop.org/archives/libreoffice/2014-July/062470.html
 tom.coll91@gmail.com;Collerton, Thomas;http://lists.freedesktop.org/archives/libreoffice/2012-January/024242.html
@@ -1140,7 +1143,7 @@ vishvbrahmbhatt19@gmail.com;Brahmbhatt, Vishv;http://lists.freedesktop.org/archi
 visportella@gmail.com;Portella, Victor Sanches;http://lists.freedesktop.org/archives/libreoffice/2014-November/064355.html
 viventa1@yahoo.es;Vendrell, Vicente;http://lists.freedesktop.org/archives/libreoffice/2012-May/031996.html
 vm@quetschke.org;Quetschke, Volker;http://lists.freedesktop.org/archives/libreoffice/2012-March/028219.html
-vmiklos@collabora.co.uk;Vajna, Miklos;http://lists.freedesktop.org/archives/libreoffice/2011-November/020585.html
+vmiklos@frugalware.org;Vajna, Miklos;http://lists.freedesktop.org/archives/libreoffice/2011-November/020585.html
 voilavoila28@yahoo.in;Kale, Aditya;http://lists.freedesktop.org/archives/libreoffice/2014-February/059724.html
 volker.ahrendt@oracle.com;*UNKNOWN*;COMPANY LICENSE: Oracle
 vossman77@yahoo.com;Voss, Neil (fourier);GIT AUTHOR 2013-06
@@ -1202,5 +1205,3 @@ zika.letrange@gmail.com;L'Etrange, Zika;http://lists.freedesktop.org/archives/li
 zjchen@apache.org;Chen ZuoJun;COMPANY LICENSE: APACHE
 zolicsaba@yahoo.com;Csaba, Geczi Zoltan;https://lists.freedesktop.org/archives/libreoffice/2016-December/076433.html
 zolniatamas@caesar.elte.hu;Zolnai, Tamás;http://article.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/33678
-cedricbosdo@openoffice.org;Bosdo, Cedric;AUDIT GIT AUTHOR 2009-10
-federico@ximian.com;Federico;AUDIT GIT NONE