RESET domain-map and aliases.

Reset to f8bf162ee4a5cbc21442b2bf271cab0efcc82cd2
which is the last commit before the work started.

audit is left untouched, since it already contained
files with this commit.

2 files changed, 321 insertions, 449 deletions

diff --git a/aliases b/aliases
index 495e0124..f8cf74aa 100644
--- a/aliases
+++ b/aliases
@@ -1,467 +1,352 @@
-robin.r.kumar@ericsson.com 2robinsaini@gmail.com
-aidan@openoffice.org abutler@openoffice.org
-af@apache.org af@a-w-f.de
-af@openoffice.org af@a-w-f.de
+# Syntax: <other-name> <std. alias>
+
+tchvatal@suse.cz tchvatal@novell.com
+tomas.chvatal@gmail.com tchvatal@novell.com
+scarabeus@gentoo.org tchvatal@novell.com
+jgraeme+git@gmail.com jgraeme+lists@gmail.com
+gilforcada@guifi.net gforcada@gnome.org
+julio.hoffiman@gmail.com julio.hoffimann@gmail.com
+beppec56@openoffice.org giuseppe.castagno@acca-esse.eu
+beppe@dsklnx.host.local giuseppe.castagno@acca-esse.eu
+lohmaier+LibreOffice@googlemail.com cloph@openoffice.org
+Fischer<andre.f.fischer@oracle.com 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
-bundeswerner@googlemail.com alexanderwerner@floyd.documentfoundation.org
-alex@documentfoundation.org alexanderwerner@floyd.documentfoundation.org
-a.werner@wub-akustik.de alexanderwerner@floyd.documentfoundation.org
-alvarezp@alvarezp.ods.org alvarezp@ods.org
-arist@apache.org andrew.rist@oracle.com
-andrzej.hunt@collabora.com andrzej@ahunt.org
-andrzej@hunt.org andrzej@ahunt.org
-andthebrain@softfrog.ca andthebrain@softfrog.com
-andy.m.holder@googlemail.com andy.m.holder@gmail.com
-xisco@xisco-pc.(none) anistenis@gmail.com
-xisco@xisco-laptop.(none) anistenis@gmail.com
-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@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
-ashod.nakashian@collabora.co.uk ashodnakashian@yahoo.com
-ashnakash@gmail.com ashodnakashian@yahoo.com
-at.higginsonatgmail.com at.higginson@gmail.com
-aurimas@gmail.com aurimas@members.fsf.org
-austinchenyw@gmail.com austinchen.94@gmail.com
-richard@hughsie.com autohughski@gmail.com
-bjoern.michaelsen@canonical.com b_michaelsen@openoffice.org
-"bjoern michaelsen" b_michaelsen@openoffice.org
-aron.budea@collabora.com baron@caesar.elte.hu
-babu.vincent@ericsson.com bavincen.in@gmail.com
-bdrung@debian.org bdrung@ubuntu.com
-bero@arklinux.org bero@arklinux.ch
-br@blankpage.ch bero@arklinux.ch
-blechji4@fel.cvut.cz blecha.jiri@gmail.com
-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
-trtle@yahoo.com chaqou@gmail.com
-chris.sherlock@collabora.com chris.sherlock79@gmail.com
-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.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
-e12346@ce.pdn.ac.lk chudugama@gmail.com
+af@openoffice.org af@a-w-f.de
+af@apache.org af@a-w-f.de
+frank.schoenheit@oracle.com fs@openoffice.org
+frank.schoenheit@sun.com fs@openoffice.org
+libreoffice@mcmurrays.org smcmurray@mcmurrays.org
+oliver.specht@cib.de os@openoffice.org
+Thorsten.Behrens@cib.de thb@openoffice.org
+tbehrens@suse.com thb@openoffice.org
+tbehrens@novell.com thb@openoffice.org
+thb@thorstens-computer.local thb@openoffice.org
+thb@documentfoundation.org thb@openoffice.org
+niko.ronkko@wippies.fi ronkko@iki.fi
+kaplanlior@gmail.com kaplan@debian.org
+pereriksson@openoffice.org per@erinet.se
+jpower27@cox.net jpowers27@cox.net
+andi@linux-87ht.site maand@gmx.de
+andi@lappiandreas.site maand@gmx.de
+philipp.lohmann@sun.com pl@openoffice.org
+philipp.lohmann@oracle.com pl@openoffice.org
+dirfin@broffice.org olivier.hallot@documentfoundation.org
+olivier.hallot@alta.org.br olivier.hallot@documentfoundation.org
+olivier.hallot@edx.srv.br olivier.hallot@documentfoundation.org
+ohallot@collabora.co.uk olivier.hallot@documentfoundation.org
+malte.timmermann@sun.com mt@openoffice.org
+malte.timmermann@oracle.com mt@openoffice.org
+michael.meeks@novell.com mmeeks@openoffice.org
+michael.meeks@suse.com mmeeks@openoffice.org
+mmeeks@suse.com mmeeks@openoffice.org
+ocke.janssen@sun.com oj@openoffice.org
+ocke.janssen@oracle.com oj@openoffice.org
+Kohei@lenovo-quad.(none) kohei@openoffice.org
+kyoshida@kohei-lenovo.(none) kohei@openoffice.org
+kyoshida@novell.com kohei@openoffice.org
+kohei.yoshida@suse.com kohei@openoffice.org
+kohei.yoshida@gmail.com kohei@openoffice.org
+kohei.yoshida@collabora.com kohei@openoffice.org
+noel.power@novell.com npower@openoffice.org
+npower@linux-h0uc.site npower@openoffice.org
+nopower@novell.com npower@openoffice.org
+noel.power@suse.com npower@openoffice.org
+nopower@suse.com npower@openoffice.org
 christian.lippka@oracle.com cl@openoffice.org
 christian.lippka@sun.com cl@openoffice.org
 cl@lippka.com cl@openoffice.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
+rene@openoffice.org rene@debian.org
+rene@rene-engelhard.de rene@debian.org
+rene@frodo.lan rene@debian.org
+thomas.lange@sun.com tl@openoffice.org
+thomas.lange@oracle.com tl@openoffice.org
+rodo@rychlik.lounovice rodo@novell.com
+rodo@obluda.lounovice rodo@novell.com
+pavel@build.kancl.blue-point.cz pavel@janik.cz
+pmladek@novell.com pmladek@suse.cz
+pmladek@openoffice.org pmladek@suse.cz
+pmladek@plop.suse.cz pmladek@suse.cz
+pmladek@walk.suse.cz pmladek@suse.cz
 caolan@localhost.localdomain cmc@openoffice.org
+caolanm@redhat.com cmc@openoffice.org
 caolan@minimac.(none) cmc@openoffice.org
-foskey@optushome.com.au cmc@openoffice.org
-waratah@openoffice.org cmc@openoffice.org
-cniehaus@kde.org cniehaus@gmx.de
-hamza.abdelkebir@gmail.com comtact@hamza-abdelkebir.eu
-csaba.borbola@openoffice.org csaba@openoffice.org
-david.ostrovsky@gmx.de d.ostrovsky@gmx.de
-david@ostrovsky.org d.ostrovsky@gmx.de
-daniel.dev.libreoffice@gmail.com daniel.e.bankston@gmail.com
-danlrobertson89@gmail.com danlrobertson@gmail.com
-davewwpublic@gmail.com dave.wwpublic@gmail.com
-davidh@sharpblue.org david.hobley@sharpblue.org
-tymyjan@yahoo.co.uk devel.marian.scerbak@gmail.com
-jmurugan@kacst.edu.sa developer.jesso@gmail.com
-dezsiszabi@hotmail.com dezsiszabi88@gmail.com
-dozsa@linux-dugf.site dozsabalint@gmail.com
-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
-drocha616@gmail.com ejrsfnm4@yahoo.com
-elton@elton.tk elton@layerjet.com
-metuxitservice@googlemail.com enrico.weigelt@vnc.biz
-erack@redhat.com er@openoffice.org
-erack@sun.com er@openoffice.org
+root@fedora1.s390.bos.redhat.com dtardon@redhat.com
+fa@openoffice.org dcbw@redhat.com
+daniel.rentz@sun.com dr@openoffice.org
+daniel.rentz@oracle.com dr@openoffice.org
+martin@gallwey.com mtg@openoffice.org
+armin.le.grand@cib.de armin.le.grand@me.com
+armin.le.grand@Sun.com armin.le.grand@me.com
+armin.le.grand@oracle.com armin.le.grand@me.com
+armin.theissen@openoffice.org armin@openoffice.org
+# Armin happily married with a changed name
+aw@openoffice.org armin.le.grand@me.com
+alg@apache.org armin.le.grand@me.com
 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
-robert.roth@in.com evfool@gmail.com
-alexander.wilms@zoho.com f.alexander.wilms@gmail.com
-alexander@notebook-alexander.(none) f.alexander.wilms@gmail.com
-allmann-rahn@ubuntu.ubuntu-domain f.allmann-rahn@gmx.de
-fbbcchtt9@gmail.com fabio.biocchetti@gmail.com
-farukuzun@collabora.com farakuzun@mail.com
-fitoschido@gmail.com fitojb@ubuntu.com
-reisi007@gmail.com florian.reisinger@outlook.com
-reisi.007@t-online.de florian.reisinger@outlook.com
-florei@libreoffice.org florian.reisinger@outlook.com
-fred@wang.free.fr fred.wang@free.fr
-freuter@linux-cfjm.site freuter@novell.com
-fridrich.strba@graduateinstitute.ch fridrich.strba@bluewin.ch
-fridrich@documentfoundation.org fridrich.strba@bluewin.ch
-fstrba@strbadell.localdomain fridrich.strba@bluewin.ch
+eike.rathke@oracle.com er@openoffice.org
+erAck@sun.com er@openoffice.org
+erack@redhat.com er@openoffice.org
+ooo@erack.de er@openoffice.org
 fstrba@strbalenovo.localdomain fridrich.strba@bluewin.ch
+fstrba@strbadell.localdomain fridrich.strba@bluewin.ch
 fridrich_strba@openoffice.org fridrich.strba@bluewin.ch
 fridrich.strba@bluwin.ch fridrich.strba@bluewin.ch
-frob@df.ru frob@gnome.org
-frank.schoenheit@sun.com fs@openoffice.org
-frank.schoenheit@oracle.com fs@openoffice.org
-gang65@openoffice.org gang65@poczta.onet.pl
-gang65@o2.pl gang65@poczta.onet.pl
-gautier.shopie@gmail.com gautier.sophie@gmail.com
-gilforcada@guifi.net gforcada@gnome.org
-"gregor hartmann<gh@openoffice.org" gh@openoffice.org
-moglivonwolf@t-online.de git@bldewolf.com
-launchpad@ptoye.com git@ptoye.com
-gerrit@ptoye.com git@ptoye.com
-lo@ptoye.com git@ptoye.com
-beppec56@openoffice.org giuseppe.castagno@acca-esse.eu
-beppe@dsklnx.host.local giuseppe.castagno@acca-esse.eu
-gswaminathan@kacst.edu.sa gokuls@cdac.in
-gokul.cdac@gmail.com gokuls@cdac.in
-golnaz.irannejad@gmail.com golnazirannejad@gmail.com
-g.poussel@wanadoo.fr gpoussel@gmail.com
-guillaume@lello.fr gpoussel@gmail.com
-b@bryanquigley.com gquigs@gmail.com
-axyd0000@gmail.com gxyd007@yahoo.com
-gauravdhingra.gxyd@gmail.com gxyd007@yahoo.com
-gauravdhingra@protonmail.com gxyd007@yahoo.com
-gauravsharma.gspt@gmail.com gxyd007@yahoo.com
+fridrich.strba@graduateinstitute.ch fridrich.strba@bluewin.ch
+tlillqvist@novell.com tml@iki.fi
+tml@hemulen.(none) tml@iki.fi
+tml@novell.com tml@iki.fi
+tml@openoffice.org tml@iki.fi
+tlillqvist@suse.com tml@iki.fi
+tml@collabora.com tml@iki.fi
+jody@gnome.org jody@novell.com
+Joerg.Skottke@Sun.COM jsk@openoffice.org
+"Joerg Skottke [jsk] jsk@openoffice.org" jsk@openoffice.org
+skotti@buster skotti@buster.gleitmeier.de
+skotti@wintermute skotti@buster.gleitmeier.de
+robert.sedak@sk.htnet.hr robert.sedak@sk.t-com.hr
+robert.sedak@roby.hr robert.sedak@sk.t-com.hr
+wg@openoffice.org Wolfram.Garten@oracle.com
+volker.ahrendt@sun.com volker.ahrendt@oracle.com
+va@openoffice.org volker.ahrendt@oracle.com
+w.donkers@linux-testpc.dci-electronics w.donkers@dci-electronics.nl
+matthias.huetsch@oracle.com mhu@openoffice.org
+matthias.huetsch@sun.com mhu@openoffice.org
 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
-heinzlesspam@googlemail.com heinzlesspam@gmail.com
-jens-heiner.rechtien@oracle.com hr@openoffice.org
-husain.amri@me.com husain.amri@gmail.com
-iain@iains-macbook-pro.local iainbillett@gmail.com
-ingrid.halama@oracle.com iha@openoffice.org
-j.nitschke+logerrit@ok.de j.nitschke@ok.de
-t12nslookup@gmail.com jadams@gmail.com
-jan-lo@kantert.net jan-libreoffice@kantert.net
-jani@ubuntu.com jani.monoses@canonical.com
-jani@doccumentfoundation.org jani@documentfoundation.org
-jani@mac-0c4de9c2f7c7.local jani@documentfoundation.org
-root@vm174.documentfoundation.org jani@documentfoundation.org
-jbf.faure@orange.fr jbf.faure@sud-ouest.org
-jcorrius@gmail.com jesus@softcatala.org
-antonio.fernandez@aentos.es jfernandez@igalia.com
-javier.fgb@gmail.com jfernandez@igalia.com
-jgraeme+lists@gmail.com jgraeme+git@gmail.com
-jh.bruhn97@gmail.com jh.bruhn@me.com
-joel@joel-studio-1737.(none) jmadero.dev@gmail.com
-joel.madero@gmail.com jmadero.dev@gmail.com
+mb93783@v20z-so6 mb93783@macpro-dev
+mb93783@v60x-so15.Germany.Sun.COM mb93783@macpro-dev
+mb93783@v20z-so3.germany.sun.com mb93783@macpro-dev
+mb93783@v60x-so16.Germany.Sun.COM mb93783@macpro-dev
+mb93783@V60X-SO17.germany.sun.com mb93783@macpro-dev
+mb93783@X42-SO17.germany.sun.com mb93783@macpro-dev
+mb93783@so-dumbo mb93783@macpro-dev
+hdu@apache.org duerr@de.ibm.com
+duerr@sun.com duerr@de.ibm.com
+hdu@openoffice.org duerr@de.ibm.com
+herbert.duerr@oracle.com duerr@de.ibm.com
+sg@openoffice.org Steffen.Grund@sun.com
+msc@openoffice.org Marc.Neumann@oracle.com
+Marc.Neumann@sun.com Marc.Neumann@oracle.com
+aidan@openoffice.org abutler@openoffice.org
+csaba.borbola@openoffice.org csaba@openoffice.org
+kai.ahrens@sun.com ka@openoffice.org
+bjoern.michaelsen@canonical.com b_michaelsen@openoffice.org
+bjoern.michaelsen@sun.com b_michaelsen@openoffice.org
+"bjoern michaelsen" b_michaelsen@openoffice.org
+kmachalkova@ben.suse.cz kmachalkova@suse.cz
+freuter@linux-cfjm.site freuter@novell.com
+patrick.luby@openoffice.org pluby@openoffice.org
+ping.liao@openoffice.org pliao@openoffice.org
+ericb@ordinateur-de-eric-b-2.local ericb@openoffice.org
+ebachard@gnome.org ericb@openoffice.org
+eric.bachard@free.fr ericb@openoffice.org
+ericb@ooo4kids.org ericb@openoffice.org
+devel@thanlwinsoft.org kstribley@openoffice.org
+cedric.bosdonnat@free.fr cbosdonnat@novell.com
+cedricbosdo@openoffice.org cbosdonnat@novell.com
+cedric.bosdonnat.ooo@free.fr cbosdonnat@novell.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
+bero@arklinux.org bero@arklinux.ch
 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
-joerg.skottke@sun.com 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
-kai.ahrens@oracle.com ka@openoffice.org
-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
-n.r.pearson@gmail.com kb9vqf@pearsoncomputing.net
-kelemeng@gnome.hu kelemeng@ubuntu.com
+"kami@darth.(none)" kami911@gmail.com
+"libo64@libo64.(none)" kami911@gmail.com
+"libo32@libo32.(none)" kami911@gmail.com
+sumuthu@novell.com muthusuba@gmail.com
+sumuthu@suse.com muthusuba@gmail.com
+sumuthu@collabora.com muthusuba@gmail.com
+muthu.subramanian.karunanidhi@ericsson.com muthusuba@gmail.com
+timar@gnome.hu timar@fsf.hu
+atimar@suse.com timar@fsf.hu
+atimar@novell.com timar@fsf.hu
+andras.timar@collabora.com timar@fsf.hu
+foskey@optushome.com.au waratah@openoffice.org
+shtylman@namlyths.(none) shtylman@gmail.com
+ms93807@x4240-so5 ms93807@x4240-so3
+babak.mahbod@openoffice.org bmahbod@openoffice.org
+mmaher@openoffice.org martin.maher@openoffice.org
+wg111939@sr1-eham02-02 wg111939@sr1-eham02-03
+antlists@youngman.org.uk anthony@youngman.org.uk
+serval@ilapharm.com serval2412@yahoo.fr
+drouizig@grouizig.org drouizig@drouizig.org
+rk.katana.steel@gmail rk.katana.steel@gmail.com
+norbert@sqdata.com nthiebaud@gmail.com
+n_th@linux-uefb.site nthiebaud@gmail.com
+robert.roth@in.com evfool@gmail.com
+robert.roth.off@gmail.com evfool@gmail.com
+nigel.hawkins@inmail24.com n.hawkins@gmx.com
+n.hawkins-KK0ffGbhmjU@public.gmane.org n.hawkins@gmx.com
+br@blankpage.ch bero@arklinux.ch
+kayo.hamid@gekkolinux.com.br revol.code@yahoo.com
 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
-devel@thanlwinsoft.org kstribley@openoffice.org
+kendy@collabora.com kendy@notthere.aliasdomain.foo
+Thorsten.Bosbach@Oracle.Com tbo@OpenOffice.org
+"christina rossmanith" chrrossmanith@web.de
+chr.rossmanith@gmx.de chrrossmanith@web.de
+ChrRossmanith@gmx.de chrrossmanith@web.de
+ingrid.halama@oracle.com iha@openoffice.org
+jens-heiner.rechtien@oracle.com hr@openoffice.org
+thomas.benisch@oracle.com tbe@openoffice.org
+vmiklos@openoffice.org vmiklos@frugalware.org
+vmiklos@suse.cz vmiklos@frugalware.org
+vmiklos@collabora.com vmiklos@frugalware.org
+vmiklos@collabora.co.uk vmiklos@frugalware.org
+jani@ubuntu.com jani.monoses@canonical.com
+christian@twotoasts.de christian.dywan@lanedo.com
+christian@lanedo.com christian.dywan@lanedo.com
+mitch@gimp.org michael.natterer@lanedo.com
+lionel.mamane@gestman.lu lionel@mamane.lu
+stephan.bergmann.secondary@googlemail.com sb@openoffice.org
+sbergman@googlemail.com sb@openoffice.org
+sbergman@redhat.com sb@openoffice.org
+mstahl@redhat.com mst@openoffice.org
+michael.x.stahl@oracle.com mst@openoffice.org
+felix@linux-6chh.site fezhang@suse.com
+listes.godard@laposte.net oooconv@free.fr
+lgodard.libre@laposte.net oooconv@free.fr
+andor.ertsey@muenchen.de eymux2009@googlemail.com
+Katarina.Behrens@cib.de bubli@bubli.org
+kmachalkova@suse.cz bubli@bubli.org
+kmachalkova@novell.com bubli@bubli.org
+yifan@bang.bang yfjiang@suse.com
+yfjiang@novell.com yfjiang@suse.com
+thuswa@gmail.com albert.thuswaldner@gmail.com
+matteo.casalin@poste.it matteo.casalin@gmx.com
+matteo.casalin@yahoo.com matteo.casalin@gmx.com
+tabe-wfainkbuzdxhpplsxpa2lq@public.gmane.org tantai@osdev.co.th
+g.poussel@wanadoo.fr gpoussel@gmail.com
+guillaume@lello.fr gpoussel@gmail.com
+michel.loiseleur@free.fr mloiseleur@linagora.com
+tibbylickle@googlemail.com tibbylickle@gmail.com
+eilidh.mcadam@gmail.com tibbylickle@gmail.com
+eilidh@lanedo.com tibbylickle@gmail.com
+eilidh.mcadam@itomig.de tibbylickle@gmail.com
+robert.nagy@gmail.com robert@openbsd.org
+heinzlesspam@googlemail.com heinzlesspam@gmail.com
+nemeth@openoffice.org nemeth@numbertext.org
+nemeth@collabora.com nemeth@numbertext.org
+laszlo.nemeth@collabora.com nemeth@numbertext.org
+andy.m.holder@googlemail.com andy.m.holder@gmail.com
+christoph@dogmatux.com christoph.noack@documentfoundation.org
+aurimas@gmail.com aurimas@members.fsf.org
+rjw57@cam.ac.uk rjw57@cantab.net
+gang65@openoffice.org gang65@poczta.onet.pl
+gang65@o2.pl gang65@poczta.onet.pl
+"philipp weissenbacher" p.weissenbacher@gmail.com
+kai.ahrens@oracle.com ka@openoffice.org
+oliver.craemer@oracle.com oc@openoffice.org
+jsilvasa@uoc.edu silva.and.co@gmail.com
+gravious@jollyrotten.org gently@jollyrotten.org
+"armijn@brandine.(none)" armijn@loohuis-consulting.nl
+dozsa@linux-dugf.site dozsabalint@gmail.com
+mcmurchy1917-libreoffice@yahoo.co.uk alexkempshall@btinternet.com
+allmann-rahn@ubuntu.ubuntu-domain f.allmann-rahn@gmx.de
+gerloff@fsfeurope.org gerloff@fsfe.org
+osc@dci-electronics.nl w.donkers@dci-electronics.nl
+"fou@leila.(none)" brutus@free.fr
 tinderbox@fae.suse.cz l.lunak@collabora.com
-l.lunak@centrum.cz l.lunak@collabora.com
 l.lunak@suse.cz l.lunak@collabora.com
+"niklas@niklas-VirtualBox.(none)" sleeping.pillow@gmail.com
+"santi@tartessos.(none)" smvarela@gmail.com
+emanuele.fia@laptop emanuele.fia@gmail.com
+"name29@name29-laptop.(none)" emanuele.fia@gmail.com
+exine@jun.pl bubstakker@gmail.com
+mmetz@adrian-brother.net mmetz@adrian-broher.net
+tim.retout@smoothwall.net tim@retout.co.uk
+"xisco@xisco-pc.(none)" anistenis@gmail.com
+sebastien-libreoffice@orniz.org sebastien@orniz.org
+christoph.herzog@uni-bamberg.de rhogez@googlemail.com
+cniehaus@kde.org cniehaus@gmx.de
+"at.higginsonAtgmail.com" at.higginson@gmail.com
+davidh@sharpblue.org david.hobley@sharpblue.org
+artur.dorda+libo@gmail.com artur.dorda@gmail.com
+nifgraup@gmail.com nifgraup@google.com
+t12nslookup@gmail.com jadams@gmail.com
+jbf.faure@orange.fr jbf.faure@sud-ouest.org
+libreoffice@troy.rollo.name troy@troy.rollo.name
 alonso@loria.fr laurent.alonso@inria.fr
-laurent.alonso@loria.fr laurent.alonso@inria.fr
-leighmanthegreat@hotmail.com leighman@gmx.se
-leiw@cn.ibm.com leiw@apache.org
+julien@julienPC serval2412@yahoo.fr
+jsc@openoffice.org jogischmidt@googlemail.com
+jsc@apache.org jogischmidt@googlemail.com
+od@openoffice.org orwittmann@googlemail.com
+orw@apache.org orwittmann@googlemail.com
+elton@elton.tk elton@layerjet.com
+salessandri@cert.unlp.edu.ar salessandri@nasel.com.ar
+mikew@whiteley.org mike@whiteley.org
+info@eg-internetdiensten.nl egarretsen@upcmail.nl
+jaquilina@eagleeyet.net eagles051387@gmail.com
+wmk26@cam.ac.uk weimzz@gmail.com
+"jeffrey@linux-ow08.site" jeffdchang@gmail.com
 jlc@mail2lee.com lemoyne.castle@gmail.com
-oooconv@free.fr lgodard.libre@laposte.net
-listes.godard@laposte.net lgodard.libre@laposte.net
+stevenb@kjross.com.au sebutler@gmail.com
+email@nadavvin.com nadavvin@gmail.com
+daniel.e.bankston@gmail.com daniel.dev.libreoffice@gmail.com
 ploum@ploum.net lionel@lanedo.com
-lionel.mamane@gestman.lu lionel@mamane.lu
+iain@iains-macbook-pro.local iainbillett@gmail.com
+rob@ertai.nl programming@ertai.nl
+"ertai@obelix.(none)" programming@ertai.nl
+"joel@joel-Studio-1737.(none)" jmadero.dev@gmail.com
+qubit@runcibility.com bishop.robinson@gmail.com
+bdrung@debian.org bdrung@ubuntu.com
+jmurugan@kacst.edu.sa developer.jesso@gmail.com
+luc@bassenge.castermans.org luc.castermans@gmail.com
+david@ostrovsky.org d.ostrovsky@gmx.de
+david.ostrovsky@gmx.de d.ostrovsky@gmx.de
+laurent.balland-poirier@laposte.net jumbo4444@yahoo.fr
+andrzej@hunt.org andrzej@ahunt.org
 lodevlist@ogersoft.at lodev@ogersoft.at
+leighmanthegreat@hotmail.com leighman@gmx.se
 gerhard.oettl@ogersoft.at lodev@ogersoft.at
-luc@bassenge.castermans.org luc.castermans@gmail.com
-im.duelli@web.de m.duelli@web.de
-andi@lappiandreas.site maand@gmx.de
-andi@linux-87ht.site maand@gmx.de
-wehner@informatik.uni-freiburg.de mail@svenwehner.de
-manik10044@iiitd.ac.in manikmalhotra92@gmail.com
-msc@openoffice.org marc.neumann@oracle.com
-marc.neumann@sun.com marc.neumann@oracle.com
-marc-andre@atc.tcs.com marcandre.laverdiere@gmail.com
+kevin@alliknow.net kevin.hausmann@gmail.com
+metuxitservice@googlemail.com enrico.weigelt@vnc.biz
+zolnaitamas2000@gmail.com zolniatamas@caesar.elte.hu
+zolnaitamas2000g@gmail.com zolniatamas@caesar.elte.hu
+zolnaitamas2000@gamil.com zolniatamas@caesar.elte.hu
+tamas.zolnai@collabora.com zolniatamas@caesar.elte.hu
+tomaz.vajngerl@collabora.com quikee@gmail.com
+tomaz.vajngerl@collabora.co.uk quikee@gmail.com
+"strubul@ubuntu.(none)" strubulis@gmail.com
+stanislav.horacek@google.com stanislav.horacek@gmail.com
+gswaminathan@kacst.edu.sa gokul.cdac@gmail.com
+regina@apache.org rb.henschel@t-online.de
+leiw@apache.org leiw@cn.ibm.com
+zhangjf@apache.org zhangjf@cn.ibm.com
+arist@apache.org andrew.rist@oracle.com
+thardeck@suse.de thardeck@suse.com
+s.mehrbrodt@googlemail.com s.mehrbrodt@gmail.com
+Samuel.Mehrbrodt@cib.de s.mehrbrodt@gmail.com
+jcorrius@gmail.com jesus@softcatala.org
 marcospdss.org@gmail.com marcos.souza.org@gmail.com
-moggi@linux-clh3.site markus.mohrhard@googlemail.com
-markus.mohrhard@collabora.co.uk markus.mohrhard@googlemail.com
-mmaher@openoffice.org martin.maher@openoffice.org
-mathieu.parent@nantesmetropole.fr math.parent@gmail.com
-matteo.casalin@gmx.com matteo.casalin@yahoo.com
-matteo.casalin@libreoffice.org matteo.casalin@yahoo.com
-matteo.casalin@poste.it matteo.casalin@yahoo.com
 doko@canonical.com matthias.klose@canonical.com
-matthieu.gay.cap@gmail.com matthieu.gay@capgemini.com
-matti_lx@yahoo.de matti_lx@secure.mailbox.org
-matus@libreoffice.org matus.kukan@gmail.com
-matus.kukan@collabora.com matus.kukan@gmail.com
-yy_sq_000@siqi-pc.(none) me@siqi.fr
-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
-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
-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
-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
-nicu@0x17.ch nc@adfinis.com
 nicolas.christener@adfinis-sygroup.ch nc@adfinis.com
-laszlo.nemeth@collabora.com nemeth@numbertext.org
-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
-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
-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
-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
-olivier.hallot@libreoffice.org 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
-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
-"philipp weissenbacher" p.weissenbacher@gmail.com
-pavel@build.kancl.blue-point.cz pavel.lastovicka@blue-point.cz
-pefoley2@verizon.net pefoley2@pefoley.com
-pelloux@gmail.com pierre-eric@lanedo.com
-peter.jentsch@gmail.com pjotr@guineapics.de
-philipp.lohmann@sun.com pl@openoffice.org
-philipp.lohmann@oracle.com pl@openoffice.org
-ping.liao@openoffice.org pliao@openoffice.org
-patrick.luby@openoffice.org pluby@neooffice.org
-pluby@openoffice.org pluby@neooffice.org
-pmladek@novell.com pmladek@suse.cz
-pmladek@walk.suse.cz pmladek@suse.cz
-pmladek@openoffice.org pmladek@suse.cz
-pmladek@hopik.site pmladek@suse.cz
-pmladek@plop.suse.cz pmladek@suse.cz
-pranavk@collabora.co.uk pranav913@gmail.com
-pranav@gnome.org pranav913@gmail.com
-pranavk@libreoffice.org pranav913@gmail.com
-pranavk@collabora.com pranav913@gmail.com
-pranavk@gnome.org pranav913@gmail.com
-rob@ertai.nl programming@ertai.nl
-ertai@obelix.(none) programming@ertai.nl
-libreoffice@ertai.nl programming@ertai.nl
-tomaz.vajngerl@collabora.co.uk quikee@gmail.com
-tomaz.vajngerl@collabora.com quikee@gmail.com
-regina@apache.org rb.henschel@t-online.de
-rene@rene-engelhard.de rene@debian.org
-rene@openoffice.org rene@debian.org
-rene.engelhard.re@googlemail.com rene@debian.org
-rene@frodo.lan rene@debian.org
-christoph.herzog@uni-bamberg.de rhogez@googlemail.com
-rjw57@cam.ac.uk rjw57@cantab.net
-rk.katana.steel@gmail rk.katana.steel@gmail.com
-root@einsle.de robert.einsle@mawoh.de
-robby@mawoh.de robert.einsle@mawoh.de
-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
-rodo@rychlik.lounovice rodo@novell.com
-rodo@obluda.lounovice rodo@novell.com
-libo@rodolfo.eng.br rodolforg@gmail.com
-rosemaryseb8@gmail.com rosemary.seb8@gmail.com
-rpmdisguise-java@yahoo.es rpm-disguise-java@yahoo.es
-heena.h.gupta@ericsson.com rush2hina@gmail.com
-ryoon@netbsd.org ryo_on@yk.rim.or.jp
-samuel.mehrbrodt@cib.de s.mehrbrodt@gmail.com
-s.mehrbrodt@googlemail.com s.mehrbrodt@gmail.com
-salessandri@cert.unlp.edu.ar salessandri@nasel.com.ar
-sbergman@redhat.com sb@openoffice.org
-sbergman@googlemail.com sb@openoffice.org
-stephan.bergmann.secondary@googlemail.com sb@openoffice.org
-libo64@libo64.(none) scratch@libre-no-relation.(none)
-root@linux-3qg3.site scratch@libre-no-relation.(none)
-mb93783@v60x-so15.germany.sun.com scratch@libre-no-relation.(none)
-mb93783@v60x-so16.germany.sun.com scratch@libre-no-relation.(none)
-mb93783@v60x-so17.germany.sun.com scratch@libre-no-relation.(none)
-mb93783@v20z-so3.germany.sun.com scratch@libre-no-relation.(none)
-mb93783@x2270-so1 scratch@libre-no-relation.(none)
-libo32@libo32.(none) scratch@libre-no-relation.(none)
-wg111939@sr1-eham02-03 scratch@libre-no-relation.(none)
-mb93783@so-dumbo scratch@libre-no-relation.(none)
-mb93783@x42-so17.germany.sun.com scratch@libre-no-relation.(none)
-sean@mess.or sean@mess.org
-sebastien-libreoffice@orniz.org sebastien@orniz.org
-stevenb@kjross.com.au sebutler@gmail.com
-julien@julienpc serval2412@yahoo.fr
-serval@ilapharm.com serval2412@yahoo.fr
-shtylman@namlyths.(none) shtylman@gmail.com
-siddhartha.gairola@research.iiit.ac.in siddhartha.gairola18@gmail.com
-jsilvasa@uoc.edu silva.and.co@gmail.com
-slavek.banko@axis.cz slavek.banco@axis.cz
-niklas@niklas-virtualbox.(none) sleeping.pillow@gmail.com
-santi@tartessos.(none) smvarela@gmail.com
-milos.sramek@soit.sk sramek.milos@gmail.com
-stanislav.horacek@google.com stanislav.horacek@gmail.com
-sg@openoffice.org steffen.grund@sun.com
-steventimothyguo@gmail.com steventhimothyguo@gmail.com
-strubul@ubuntu.(none) strubulis@gmail.com
-sumuthu@novell.com sumuthu@collabora.com
-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
-thomas.benisch@oracle.com tbe@openoffice.org
-thorsten.bosbach@oracle.com tbo@openoffice.org
-tchvatal@suse.com tchvatal@novell.com
-tomas.chvatal@gmail.com tchvatal@novell.com
-tchvatal@suse.cz tchvatal@novell.com
-scarabeus@gentoo.org tchvatal@novell.com
-thardeck@suse.de thardeck@suse.com
-thorsten.behrens@cib.de thb@openoffice.org
-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@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@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
-wmk26@cam.ac.uk weimzz@gmail.com
-w.donkers@linux-testpc.dci-electronics winfrieddonkers@libreoffice.org
-w.donkers@dci-electronics.nl winfrieddonkers@libreoffice.org
-osc@dci-electronics.nl winfrieddonkers@libreoffice.org
-wg@openoffice.org wolfram.garten@oracle.com
-antlists@youngman.org.uk wolslists@youngman.org.uk
-anthony@youngman.org.uk wolslists@youngman.org.uk
-yangzhang@multicorewareinc.9com yangzhang@multicorewareinc.com
-yifan@bang.bang yfjiang@suse.com
-yfjiang@novell.com yfjiang@suse.com
-yossizahn@gmail.com yossizahn@okmail.co.il
-"yr at myooo dot ru" yr@myooo.ru
-zhangjf@cn.ibm.com zhangjf@apache.org
-zolnaitamas2000@gamil.com zolniatamas@caesar.elte.hu
-tamas.zolnai@collabora.com zolniatamas@caesar.elte.hu
-zolnaitamas2000@gmail.com zolniatamas@caesar.elte.hu
+gautier.shopie@gmail.com gautier.sophie@gmail.com
+"alexander@Notebook-Alexander.(none)" alexander.wilms@zoho.com
 root@linux-dre0.site zolniatamas@caesar.elte.hu
-zolnaitamas2000g@gmail.com zolniatamas@caesar.elte.hu
+tarun.k.kumar@ericsson.com tk7ua1678@gmail.com
+# malformed author
+"Gregor Hartmann<gh@openoffice.org" gh@openoffice.org
+# one time "via gerrit-commit"
+gerrit@gerrit.libreoffice.org me@siqi.fr
+matus.kukan@collabora.com matus.kukan@gmail.com
+andrzej.hunt@collabora.com andrzej@ahunt.org
+reisi007@gmail.com florei@libreoffice.org
+reisi.007@t-online.de florei@libreoffice.org
+chris.sherlock@collabora.com chris.sherlock79@gmail.com
+mihai.varga@collabora.com mihai.mv13@gmail.com
+hcastro@collabora.com hcvcastro@gmail.com
+markus.mohrhard@collabora.co.uk markus.mohrhard@googlemail.com
+ashod.nakashian@collabora.co.uk ashodnakashian@yahoo.com
+
+# Aliases to get affiliations right from Apache
+chengjh@apache.org chengjh@unknown.ibm.com
+liuzhe@apache.org liuzhe@unknown.ibm.com
+leidb@apache.org leidb@unknown.ibm.com
+wangzcdl@apache.org wangzcdl@unknown.ibm.com
+sunying@apache.org sunying@unknown.ibm.com
+bjcheny@apache.org bjcheny@unknown.ibm.com
+mayongl@apache.org mayongl@unknown.ibm.com
+lijiany@apache.org lijiany@unknown.ibm.com
diff --git a/domain-map b/domain-map
index 0be1f261..5b5f7e4d 100644
--- a/domain-map
+++ b/domain-map
@@ -163,8 +163,6 @@ cloph@openoffice.org TDF
 
 jani@documentfoundation.org TDF
 
-tietze.heiko@gmail.com TDF
-
 ashodnakashian@yahoo.com Assigned <2015-12-12
 ashodnakashian@yahoo.com Collabora
 
@@ -259,14 +257,3 @@ xamarin.com     Xamarin
 cib.de          CIB
 itomig.de       ITOMIG
 peralex.com     Peralex
-
-# Added to provide consistencty with Wiki
-conectiva.com    Conectiva
-conectiva.com.br Conectiva
-bogus-non-domain Bogus
-mandriva.com     Mandriva
-credativ.com     Credativ
-codeweavers.com  Codeweavers 
-connectiva       Connectiva
-suse.de          Suse
-mandrake.com     Mandrake