Added new email mappings

diff --git a/domain-to-employer b/domain-to-employer
index 05ab209298c1e984b9a41aa6cdba739d37a06f08..c28dc4bae435de3a4b5b499fc35f5f1f55e0155a 100644 (file)
--- a/domain-to-employer
+++ b/domain-to-employer
@@ -18,7 +18,7 @@ agilemesh.com AgileMesh
 agilent.com    Agilent Corporation
 aimvalley.nl   AimValley
 airvana.com    Airvana
-aist.go.jp     (Academia, National Institute of Advanced Industrial Science and Technology)
+aist.go.jp     (Academia) National Institute of Advanced Industrial Science and Technology
 ait.ie         Athlone Institute of Technology
 aizo.com       aizo ag
 akamai.com     Akamai Technologies
@@ -113,7 +113,7 @@ calao-systems.com   Calao-Systems
 call-direct.com.au     Call Direct
 calva.com      CalvaEDI
 calxeda.com    Calxeda
-cam.ac.uk      (Academia, University of Cambridge)
+cam.ac.uk      (Academia) University of Cambridge
 candelatech.com        Candela Technologies
 canonical.com  Canonical
 cardaccess-inc.com     Card Access
@@ -135,10 +135,10 @@ chumby.com        Chumby Industries
 cinterion.com  Cinterion Wireless Modules
 cirrus.com     Cirrus Logic
 cisco.com      Cisco
-citi.umich.edu (Academia, Univ. of Michigan CITI)
+citi.umich.edu (Academia) Univ. of Michigan CITI
 citrix.com     Citrix
-city.ac.uk     (Academia, City University)
-clemson.eu     (Academia, Clemson University)
+city.ac.uk     (Academia) City University
+clemson.eu     (Academia) Clemson University
 clustcom.com   Cluster Computing
 clusterfs.com  Sun
 cn.fujitsu.com Fujitsu
@@ -184,7 +184,7 @@ cyberguard.com      Secure Computing
 cybernetics.com        Cybernetics
 cyberswitching.com     Cyber Switching
 cypress.com    Cypress Semiconductor
-data.slu.se    Uppsala University
+data.slu.se    (Academia) Uppsala University
 dave.eu        Dave S.r.l.
 dekaresearch.com       Deka Research and Development
 dell.com       Dell
@@ -302,7 +302,7 @@ grid-net.com        Grid-Net
 griffin.net    Griffin INet
 grml.org       Grml Solutions
 grnet.gr       GRNET
-gtri.gatech.edu        (Academia, Georgia Tech Research Institute)
+gtri.gatech.edu        (Academia) Georgia Tech Research Institute
 gts.it         G.T.S. Srl
 gvs.co.yu      GVS
 hale.at                HALE electronic GmbH
@@ -364,7 +364,7 @@ iptel.org   iptelorg GmbH
 iram.es        IRAM
 iseebcn.com    ISEE
 isismpp.fr     isis-mpp
-ispras.ru      (Academia, Institute for System Programming Russian Academy of Sciences)
+ispras.ru      (Academia) Institute for System Programming Russian Academy of Sciences
 i-tech.si      Instrumentation Technologies
 itelematic.com International Telematics Ltd
 ivitera.com    IVITERA a.s.
@@ -388,7 +388,7 @@ keyspan.com InnoSys
 kionix.com     Kionix
 kpitcummins.com        KPIT Cummins
 ksplice.com    Oracle
-lab126.com     Amazon.com
+lab126.com     Amazon
 lacie.com      LaCie
 lantiq.com     Lantiq
 laptop.org     OLPC
@@ -408,7 +408,7 @@ linuxfoundation.org Linux Foundation
 linx.net       London Internet Exchange
 lippert-at.de  LiPPERT Embedded Computers GmbH
 lippertembedded.de     LiPPERT Embedded Computers GmbH
-ll.mit.edu     (Academia, MIT Lincoln Laboratory)
+ll.mit.edu     (Academia) MIT Lincoln Laboratory
 llnl.gov       Lawrence Livermore National Laboratory
 lntinfotech.com        Larsen & Toubro Infotech
 lnxi.com       Linux Networx
@@ -472,8 +472,8 @@ movial.com  Movial
 movial.fi      Movial
 mpcdata.com    MPC Data
 mpc-data.co.uk MPC Data
-mpg.de         (Academia, Max-Planck-Institut for Astrophysics)
-mprc.pku.edu.cn        (Academia, Peking University Microprocessor R&D Center)
+mpg.de         (Academia) Max-Planck-Institut for Astrophysics
+mprc.pku.edu.cn        (Academia) Peking University Microprocessor R&D Center
 m-privacy.de   m-privacy GmbH
 mrv.com                MRV Communications
 msc-ge.com     MSC Vertriebs GmbH
@@ -519,7 +519,7 @@ nomovok.com Nomovok Ltd.
 norbit.no      Norbit
 nortel.com     Nortel
 notalvision.com        NotalVision
-novell.com     Novell
+novell.com     Suse
 novero.com     novero GmbH
 nppfactor.kiev.ua Factor-SPE
 nrchpc.ac.cn   Tianjin Zhongke Blue Whale Information Technologies
@@ -712,7 +712,7 @@ stonesoft.com       Stonesoft Corporation
 storwize.com   Storwize
 strandera.com  Strandera Corporation
 streamunlimited.com    StreamUnlimited
-strongswan.org (Academia, University of Applied Sciences Rapperswil)
+strongswan.org (Academia) University of Applied Sciences Rapperswil
 sun.com        Sun
 sunplusct.com  Sunplus Core Technology
 suse.com       Suse
@@ -867,6 +867,7 @@ invisiblethingslab.com      Invisible Things Lab
 dvrabel@cantab.net     Citrix
 konrad@darnok.org      Oracle
 amazon.com     Amazon
+amazon.de      Amazon
 gridcentric.ca GridCentric
 ben@guthro.net Virtual Computer
 standby24x7@gmail.com  (Individual)
@@ -886,10 +887,10 @@ xen.org   (Individual)
 aravindh@virtuata.com  Virtuata
 hitachiconsulting.com  Hitachi
 none@none      (Individual)
-entel.upc.edu  (UPC, Academia)
+entel.upc.edu  (UPC) Academia
 justing@spectralogic.com       SpectraLogic
 zentific.com   Zentific
-matthew.fioravante@jhuapl.edu  (John Hopkins University, Academia)
+matthew.fioravante@jhuapl.edu  (Academia) John Hopkins University
 julian.pidancet@gmail.com      (Individual)
 unknown@hacker.netn    (Individual)
 dcm@mccr.org   (Individual)
@@ -1001,7 +1002,7 @@ ssullivan@liquidweb.com   (Individual)
 pbrobinson@gmail.com   (Individual)
 wiedi@frubar.net       (Individual)
 dan@danny.cz   (Individual)
-eggert@cs.ucla.edu     (UCLA, Academia)
+eggert@cs.ucla.edu     (Academia) UCLA
 zulcss@gmail.com       (Individual)
 rwoodsmall@gmail.com   (Individual)
 lincoln_myers@yahoo.com        (Individual)
@@ -1021,3 +1022,14 @@ lge.com          LG
 lg.com         LG
 redpill-linpro.com     Redpill Linpro
 m2r.biz                M2R
+ieee.org   IEEE
+fensystems.co.uk Fen Systems
+vates.fr       Vates
+juniper.net    Juniper
+rackspace.com  Rackspace
+ocamlpro.com   OCamlPro
+# 2015
+nccgroup.com   NCC Group
+bitdefender.com        BitDefender
+skyportsystems.com     Skyport Systems
+

diff --git a/email-aliases b/email-aliases
index 11e62ca0f73423df5ef5723b80e21cfe26a68623..988f6ff4ec18368d6959028ef5f9285c1078c61f 100644 (file)
--- a/email-aliases
+++ b/email-aliases
@@ -209,3 +209,5 @@ zonque@gmail.com    daniel@caiaq.org        # Daniel mack
 # Xen 4.3
 fabio.fantoni@m2r.biz  fantonifabio@tiscali.it
 xen@wind.enjellic.com  greg@wind.enjellic.com  
+
+

diff --git a/email-to-employer b/email-to-employer
index bb71a833fe6c34a0c8250a1432e3dd8ccc0a4b67..cc6fce48ea344c95e83baef8b2b94063298ccb13 100644 (file)
--- a/email-to-employer
+++ b/email-to-employer
@@ -28,7 +28,7 @@ albcamus@gmail.com    Sun                     # Jike Song
 albcamus@gmail.com     Wind River < 2008-06-01 # Jike Song
 alex@botch2.com                AMD
 alex@botch2.(none)     AMD
-alex@csgraf.de         Novell                  # Alexander Graf
+alex@csgraf.de         Suse                    # Alexander Graf
 alexdeucher@gmail.com  AMD                     # Alex Deucher, 11/2007
 alex@flawedcode.org    SICE S.A. - ACS Dragados        # Alejandro Martinez Ruiz
 alexneblett01@yahoo.com        IAN Investments # Alex Neblett
@@ -37,7 +37,7 @@ amitshah@gmx.net      Qumranet                # Amit Shah
 amnonaar@gmail.com     (Individual)
 andersk@mit.edu                Ksplice, Inc.
 andi@firstfloor.org    Intel                   # Andi Kleen
-andi@firstfloor.org    Novell < 2008-03-14     # Andi Kleen
+andi@firstfloor.org    Suse < 2008-03-14       # Andi Kleen
 andre.goddard@gmail.com        LG Electronics          # Andre Goddard Rosa
 andy@greyhouse.net     Red Hat         # Andy Gospodarek
 andy@netfall.com       Onstor                  # Andrew Sharp
@@ -77,14 +77,14 @@ bernds_cb1@t-online.de      Analog Devices          # Bernd Schmidt
 bfields@fieldses.org   University of Michigan  # J. Bruce Fields
 bhaskie@gmail.com      GlobalLogic             # Bhaskar Dutta
 blogic@openwrt.org     Fon                     # John Crispin
-brandon@ifup.org       Novell                  # Brandon Philips
+brandon@ifup.org       Suse                    # Brandon Philips
 brgerst@gmail.com      Infor < 2009-02-01  # from linkedin page
 brgerst@gmail.com      (Individual)
 brian@bristyle.com     Calit2                  # Brian Braunstein
 briglia.anderson@gmail.com     Nokia           # Anderson Briglia
 bruno.braga@gmail.com  Brastel Telecom # Bruno Braga
 buytenh@wantstofly.org Marvell                 # Lennert Buytenhek
-c99drn@cs.umu.se       Novell
+c99drn@cs.umu.se       Suse
 caglar@pardus.org.tr   Pardus
 carmelo73@gmail.com    ST Microelectronics     # Carmelo Amoroso
 chainsaw@gentoo.org    London Internet Exchange        # Tony Vroon
@@ -115,7 +115,7 @@ dan.j.rosenberg@gmail.com Virtual Security Research # Dan Rosenberg
 dannf@dannf.org                        HP              # dann frazier
 dared1st@yahoo.com     Phoenix Technologies    # Aleksey Gorelov
 davej@codemonkey.org.uk        Red Hat         # Dave Jones
-dave@jikos.cz  Novell                          # David Sterba
+dave@jikos.cz  Suse                            # David Sterba
 davem@davemloft.net    Red Hat         # Dave Miller
 david@santinoli.com    Fastpath Research       # David Santinoli
 da-x@monatomic.org     XIV Information Systems # Dan Aloni
@@ -184,7 +184,7 @@ hpa@zytor.com       Intel
 hpa@zytor.com  (Individual) < 2009-01-01 # approx
 hpa@zytor.com  rPath < 2008-10-20
 hrogge@googlemail.com  FGAN                    # Henning Rogge
-htejun@gmail.com       Novell                  # Tejun
+htejun@gmail.com       Suse                    # Tejun
 htmldeveloper@gmail.com        DSO National Laboratories       # Peter Teoh
 hugh@blemings.org      IBM                     # Hugh Blemings
 hughsient@gmail.com    Red Hat         # Richard Hughes
@@ -196,7 +196,7 @@ ishikawa@hanzubon.jp        OSDN                    # ISHIKAWA Mutsumi
 isloginov@gmail.com    NIISI RAS       # Ilya Loginov
 jacmet@sunsite.dk      Barco                   # Peter Korsgaard
 james.bottomley@hansenpartnership.com Hansen Partnership < 2009-01-01
-james.bottomley@hansenpartnership.com Novell < 2011-05-01
+james.bottomley@hansenpartnership.com Suse < 2011-05-01
 james.bottomley@hansenpartnership.com Parallels
 jan@gondor.com         reliablesolutions       # Jan Niehusmann
 jan.kiszka@web.de      Siemens                 # Jan Kiszka
@@ -245,7 +245,7 @@ keithp@keithp.com   Intel           # Keith Packard
 kem@kem.org            Red Hat
 kernel1@cyberdogtech.com       Google          # Matt LaPlante
 kevlo@kevlo.org                Micro-Star International        # Kevin Lo
-khali@linux-fr.org     Novell                  # Jean
+khali@linux-fr.org     Suse                    # Jean
 khilman@deeprootsystems.com (Consultant)
 khilman@deeprootsystems.com (Consultant) < 2010-06-01
 khilman@deeprootsystems.com Texas Instruments  < 2011-01-01
@@ -269,7 +269,7 @@ lee.nipper@gmail.com        Avocent                 # Lee Nipper
 lenb@kernel.org        Intel                           # Len Brown
 lennart@poettering     Red Hat         # Lennart Poettering
 leo@zh-kernel.org      Freescale               # Li Yang
-libv@skynet.be         Novell
+libv@skynet.be         Suse
 linuxzsc@gmail.com     Freescale               # Richard Zhao
 linville@tuxdriver.com Red Hat # John Linville
 liodot@gmail.com       SofaWare
@@ -301,7 +301,7 @@ mcuos.com@gmail.com Nuvoton Technology      # Wan ZongShun
 me@felipebalbi.com     Nokia                   # Felipe Balbi
 me@mortis.eu   Signips                 # Giel van Schijndel
 mesak82@gmail.com      Texas Instruments       # Misael Lopez
-metan@ucw.cz           Novell          # Cyril Hrubis
+metan@ucw.cz           Suse            # Cyril Hrubis
 mfuzzey@gmail.com      Parkeon                 # Martin Fuzzey
 mibru@gmx.de   Kontron Embedded Modules                # Michael Brunner
 michaelc@cs.wisc.edu   Red Hat         # Mike Christie
@@ -310,7 +310,7 @@ mika.westerberg@iki.fi      Nokia                   # Mika Westerberg
 mike@halcrow.us        IBM                     # Michael Halcrow
 mikem@beardog.cca.cpqcorp.net  HP              # Mike Miller
 mikey@neuling.org      IBM                     # Michael Neuling
-miklos@szeredi.hu      Novell                  # Miklos
+miklos@szeredi.hu      Suse                    # Miklos
 mikulas@artax.karlin.mff.cuni.cz       Red Hat # Mikulas Patocka
 miltonm@bga.com                IBM     # Milton Miller
 mingo@elte.hu  Red Hat                 # Ingo
@@ -330,7 +330,7 @@ nab@linux-iscsi.org Rising Tide Systems     # Nicholas Bellinger
 nakam@linux-ipv6.org   Hitachi                 # Masahide NAKAMURA
 namonai@gmail.com      In-Store Broadcasting Network   # Craig Kelley
 nathalie.furmento@labri.fr     CNRS
-neilb@cse.unsw.edu.au  Novell                  # Neil Brown
+neilb@cse.unsw.edu.au  Suse                    # Neil Brown
 neiljay@gmail.com      Imagination Technologies        # Neil Jones
 ngupta@vflare.org      (Academia)
 ngupta@vflare.org      VMware  < 2010-07-07 # Nitin Gupta
@@ -343,10 +343,10 @@ norsk5@yahoo.com  SoftwareBitMaker                # Doug Thompson
 ntl@pobox.com  IBM                     # Nathan Lynch
 oakad@yahoo.com                (Individual)
 ob@emanuele.us         Crystalfontz    # Robert Emanuele
-obi@linuxtv.org                (Unknown)
+obi@linuxtv.org                (Individual) 
 ohad@wizery.com                Texas Instruments       # Ohad Ben-Cohen
 oliver@neukum.org      (Individual)
-oliver@neukum.org      Novell < 2009-03-03             # Oliver Neukum
+oliver@neukum.org      Suse < 2009-03-03               # Oliver Neukum
 olof@lixom.net Agnilux < 2010-05-01 # pers comm
 olof@lixom.net Google  # ibid
 olof@lixom.net PA Semi < 2009-08-29 # pers. comm, since ~1/2006
@@ -357,7 +357,7 @@ patrick.boettcher@desy.de   DiBcom          # Patrick Boettcher
 patrickglass@gmail.com PMC-Sierra < 2009-04-01         # Patrick Glass
 patrickglass@gmail.com Qualcomm
 paulus@samba.org       IBM                     # Paul
-pavel@ucw.cz   Novell                          # Pavel
+pavel@ucw.cz   Suse                            # Pavel
 pawel@osciak.com       Intel   # Linkedin
 pbadari@gmail.com      IBM             # Badari Pulavarty
 pcnet32@verizon.net    Cisco                   # Don Fry
@@ -378,7 +378,7 @@ rdoursenaud@free.fr EMA Tech        # Rapha
 #
 rdunlap@xenotime.net   Oracle                  # Randy Dunlap
 rgetz@blackfin.uclinux.org     Analog Devices  # Robin Getz
-rgoldwyn@gmail.com     Novell                  # Goldwyn Rodrigues
+rgoldwyn@gmail.com     Suse                    # Goldwyn Rodrigues
 richard.genoud@gmail.com       Adeneo          # Richard Genoud
 r.marek@assembler.cz   SYSGO                   # Rudolf Marek
 rminnich@gmail.com     Sandia National Labs    # Ron Minnich
@@ -401,7 +401,7 @@ salsasepp@googlemail.com    LizardQ         # Stefan Steuerwald
 sandeen@sandeen.net    Red Hat         # Eric Sandeen
 sandeepksinha@gmail.com        NetApp                  # SandeepKsinha
 sandmann@daimi.au.dk   Red Hat
-sankar.curiosity@gmail.com     Novell          # Sankar P
+sankar.curiosity@gmail.com     Suse            # Sankar P
 sbrown@cortland.com    InfoObjects             # Steve Brown
 sds@tycho.nsa.gov      US National Security Agency     # Stephen Smalley
 seattleplus@gmail.com  IBM             # Dean Hildebrand
@@ -429,7 +429,7 @@ svendsen@pvv.org    Norbit
 sven.eckelmann@gmx.de  Saxnet Gmbh.            # Sven Eckelmann
 svens@bitebene.org     Astaro                  # Sven Schnelle
 svens@stackframe.org   Astaro                  # Sven Schnelle
-sven@thebigcorporation.com     Novell          # Sven-Thorsten Dietrich
+sven@thebigcorporation.com     Suse            # Sven-Thorsten Dietrich
 szpajder@staszic.waw.pl        Sferia                  # Tomasz Lemiech
 tabbott@mit.edu                Ksplice, Inc.
 taviso@sdf.lonestar.org        Google          # Tavis Ormandy
@@ -438,7 +438,7 @@ thomas.abraham@linaro.org   Samsung
 thomas.petazzoni@enix.org      Free Electrons  # Thomas Petazzoni
 tim.gardner@canonical.com      TriplePoint             # Tim Gardner
 tixy@yxit.co.uk                Linaro  # Direct employee https://wiki.linaro.org/MeetTheTeam
-tj@kernel.org          Novell                  # Tejun
+tj@kernel.org          Suse                    # Tejun
 tom.d.arbuckle@gmail.com       University of Limerick  # Tom Arbuckle
 tony@bakeyournoodle.com        IBM             # Tony Breeds
 torbenh@gmx.de         linutronix      # Torben Hohn - according to tglx
@@ -498,37 +498,190 @@ sw@weilnetz.de   Red Hat
 #
 fantonifabio@tiscali.it        M2R     # Fantoni Fabio
 chegger@amazon.de      Amazon  # Chris Egger
-xzhang@cs.uic.edu      (Academia, UIC) # Xu Zhang
+xzhang@cs.uic.edu      (Academia) UIC  # Xu Zhang
 rzvncj@gmail.com       (Individual)    # Razvan Cojocaru 
-xi@mit.edu     (Academia, MIT) # Xi Wang
+xi@mit.edu     (Academia) MIT  # Xi Wang
 greg@wind.enjellic.com (Individual)    # Greg Wettstein
 eshelton@pobox.com     (Individual)    # Eric Shelton
-huangwei@gmail.com     (Samsung)       # Wei Huang 
+huangwei@gmail.com     Samsung # Wei Huang 
 murrayie@yahoo.co.uk   (Individual)    # Ian Murray
 bastian@waldi.eu.org   (Individual)    # Bastian Blank
-samuel.thibaut@ens-lyon.org    (Academia, ENS Lyon)    # Samuel Thibault 
-lars.rasmusson@sics.se (Academia, Swedish Institute of Computer Science)       # Lars Rasmusson
+samuel.thibaut@ens-lyon.org    (Academia) ENS de Lyon  # Samuel Thibault 
+lars.rasmusson@sics.se (Academia) Swedish Institute of Computer Science        # Lars Rasmusson
 robert.vanvossen@dornerworks.com       (Individual)    # Robert VanVossen
 choonho.son@gmail.com  KT      # Choonho Son
 shakeel.butt@gmail.com (Individual)    # Shakeel Butt
-zpengxen@gmail.com     (Academia, ISCAS)       # Zhou Peng
+zpengxen@gmail.com     (Academia) ISCAS        # Zhou Peng
 roger.pau@citrix.com   Citrix  # Roger Pau Monne
 #
 # Xen 4.4 additions
 #
 mattd@bugfuzz.com  (Individual)     # Matthew Daley
-baozich@gmail.com    (Academia, National Institute for Defense Technology)     #
+baozich@gmail.com    (Academia) National Institute for Defense Technology
 kelleynnn@gmail.com    (Individual)    # Kelly Nielsen
-mva@mva.name         (Unknown)
-tsahee@gmx.com        (Unknown)
-dennis.yxun@gmail.com        (Unknown)
-kjetil.homme@            (Unknown)
-bob@proulx.com        (Unknown)
-anil@recoil.org            (Academia, University of Cambridge)
-rwxybh@126.com      (Unknown)
-marc.ceeeee@gmail.com         (Unknown)
+mva@mva.name         (Individual) 
+tsahee@gmx.com        (Individual) 
+dennis.yxun@gmail.com        (Individual) 
+kjetil.homme@            (Individual) 
+bob@proulx.com        (Individual) 
+anil@recoil.org            (Academia) University of Cambridge
+rwxybh@126.com      (Individual) 
+marc.ceeeee@gmail.com         (Individual) 
 mneilsen@acm.org      (Academia)
 debian@good-with-numbers.com      (Individual)    
 nai.xia@gmail.com     (Individual)    
 alexandrasava18@gmail.com (Individual)    
-jym@netbsd.org                     (Individual)     
+jym@netbsd.org                     (Individual)
+#
+# Xen 4.5 additions
+# 
+mengxu@cis.upenn.edu   (Academia) University of Pennsylvania
+talex5@gmail.com       (Academia) University of Cambridge
+ufimtseva@gmail.com    Oracle 
+tklengyel@sec.in.tum.de        (Academia) Technische Universitat Muenchen
+karim.allah.ahmed@gmail.com    (Academia) University of Cambridge
+avanzini.arianna@gmail.com     (Academia) University of Modena and Reggio Emilia
+rcojocaru@bitdefender.com      Bitdefender
+markus@oberhumer.com   Oberhumer.com
+dev@zheng.li   Samsung
+suriyan.r@gmail.com    Oracle
+andryuk@aero.org       (Individual) #Jason Andryuk
+m.a.young@durham.ac.uk (Academia) Durham University
+markus.hauschild@rz.uni-regensburg.de  (Academia) University of Regensburg
+v1ne2go@gmail.com      (Individual) # Denis Schneider 
+alfred.z.song@gmail.com        Alibaba
+samuel.thibault@ens-lyon.org   (Academia) ENS de Lyon
+peteryili@tencent.com  Tencent 
+don@cloudswitch.com    Verizon
+ian.campbell@citirx.com        Citrix
+emilcondrea@gmail.com  Bitdefender
+jamesjb@galois.com     Galois
+freddy77@gmail.com     Citrix
+s.munaut@whatever-company.com  Knowledge Plaza
+myselfdushyantbehl@gmail.com   (Individual) # Dushyant Behl 
+ayushruia@gmail.com    (Individual)   
+rshriram@cs.ubc.ca     (Academia) University of British Colombia
+xisisu@gmail.com       (Academia) Washington University
+dirk.behme@gmail.com   (Individual)
+tamas.k.lengyel@tum.de (Individual)
+gang.chen@asianux.com  (Individual)
+iwj@osstest.cam.xci-test.com Citrix
+iwj@woking.cam.xci-test.com Citrix
+osstest@woking.cam.xci-test.com Citrix
+ijackson@chiark.greenend.org.uk Citrix
+konrad@kernel.org Oracle
+marcel@mesa.nl (Individual)
+suresh.lalith@gmail.com        (Individual)
+owen.smith-sxgqhf6nn4dqt0dzr+alfa@public.gmane.org Citrix
+#
+# Mirage additions
+#
+thomas@gazagnaire.org  Citrix
+mort@cantab.net         (Academia) University of Nottingham
+sheets@alum.mit.edu    (Academia) MIT
+amirmc@gmail.com       (Academia) University of Cambridge
+scott.dj@gmail.com     Citrix
+armael.gueneau@ens-lyon.fr (Academia) ENS de Lyon
+balrajsingh@ieee.org        IEEE
+gregperkins@alum.mit.edu       (Academia) MIT
+thomas@gazagnaire.com  Citrix
+felipe@paradoxo.org    Citrix
+s.r.e.turner@gmail.com         Citrix
+phus.lu@gmail.com Vates
+mike.mcclurg@gmail.com Citrix
+spahmatthew@gmail.com  (Individual)
+rob@rdobson.co.uk Citrix
+george.shuklin@gmail.com       Citrix
+jmaloberti@gmail.com   (Individual)
+shuklin@selectel.ru    Citrix
+ktower@towerfamily.org  (Individual)
+sa.abramyan@gmail.com  (Individual)
+djs55@users.noreply.github.com Citrix
+marek@xivilization.net  Citrix
+simonjbeaumont@gmail.com       Citrix
+cristiklein@gmail.com  (Individual)
+wangyanbin@dayang.com.cn Dayang Technology Development Inc.
+lukedunstan81@gmail.com      (Individual)
+zaiyers@gmail.com            (Individual)
+grantmcwilliams@users.noreply.github.com    (Individual)
+cristian.klein@cs.umu.se (Individual)
+yallop@gmail.com (Academia) University of Cambridge 
+vb@luminar.eu.org (Academia) University of Cambridge
+hannes@mehnert.org (Academia) University of Cambridge
+#
+# FIXME Unknown
+#
+unitedbiscuits@gmail.com               (Unknown)
+david@numm.org                 (Unknown)
+n.oje.bar@gmail.com       (Unknown)
+#
+# FIXME Unknown Long Tail
+#
+pali.gabor@gmail.com           (Unknown)
+rudi.grinberg@gmail.com         (Unknown)
+christophe.troestler@umons.ac.be (Unknown)
+mail@christine-koppelt.de    (Unknown)
+sheets@ashimaarts.com        (Unknown)
+technomancy@gmail.com        (Unknown)
+vbmithr@gmail.com            (Unknown)
+william@sumologic.com        (Unknown)
+mthurman@gmail.com           (Unknown)
+daniel.buenzli@erratique.ch    (Unknown)
+meetup@yomimono.org    (Unknown)
+evilkidder@gmail.com        (Unknown)
+meetup@yomimono.org         (Unknown)
+vilkidder@gmail.com        (Unknown)
+fdopen@ml.ignorelist.com    (Unknown)
+david.allsopp@metastack.com   (Unknown)
+romain.calascibetta@gmail.com    (Unknown)
+mateusz.ochal@yahoo.com      (Unknown)
+hugo.heuzard@gmail.com       (Unknown)
+buzzheavyyear@users.noreply.github.com    (Unknown)
+cgaebel@janestreet.com       (Unknown)
+marklrh@gmail.com            (Unknown)
+jeff.hammerbacher@gmail.com  (Unknown)
+thomas@cryptosense.com       (Unknown)
+moonlightdrive@users.noreply.github.com    (Unknown)
+len@lnmx.org                 (Unknown)
+magnus@skjegstad.com         (Unknown)
+th3rac25@gmail.com           (Unknown)
+manu.delab@gmail.com         (Unknown)
+whitequark@whitequark.org    (Unknown)
+joshua.allmann@gmail.com     (Unknown)
+firxen@gmail.com             (Unknown)
+paurkedal@gmail.com          (Unknown)
+gregt@gt-mba.local           (Unknown)
+gabriel.scherer@gmail.com    (Unknown)
+pooh@cmu.edu                 (Unknown)
+codinuum@me.com              (Unknown)
+edwin@etorok.net             (Unknown)
+arjun@cs.umass.edu           (Unknown) 
+program@lyrique.org          (Unknown)
+philtomson@gmail.com         (Unknown)
+siraaj@khandkar.net          (Unknown)
+phg42.2a@gmail.com           (Unknown)
+fabien.dagnat@telecom-bretagne.eu    (Unknown)
+gabriel.mcarthur@gmail.com   (Unknown)
+tomo@cx4a.org                (Unknown)
+eyyub.pangearaion@gmail.com  (Unknown)
+yakov@nobreachsecurity.com   (Unknown)
+sokolov.r.v@gmail.com        (Unknown)
+sean.leather@gmail.com       (Unknown)
+markus.mottl@gmail.com       (Unknown)
+agarwal1975@gmail.com        (Unknown)
+pierre.chambart@ocamlpro.org (Unknown)
+artagnon@gmail.com           (Unknown)
+# 2015
+edgar.iglesias@gmail.com       Xilinx
+lasse.collin@tukaani.org       (Individual)
+mdontu@bitdefender.com         BitDefender
+uma.sharma523@gmail.com                (Individual)
+martin@lucina.net              (Individual)
+alecsandra.sandulescu@gmail.com        BitDefender
+andrew.cooper3@citrix          Citrix
+trevorsummerssmith@gmail.com   (Unknown)
+michipili@gmail.com            (Quintly Inc)
+mvzp10@gmail.com               (Unknown)
+artemkin@gmail.com             (CQG)
+davemgarrett@gmail.com         (Unknown)
+

diff --git a/gitdm.config b/gitdm.config
index 04bce2a61cb6277d61c64083ad06f99d083b3f25..16e1e9d8e726eb13227984c5585658fff021bf83 100644 (file)
--- a/gitdm.config
+++ b/gitdm.config
@@ -1,6 +1,5 @@
 EmailAliases email-aliases
 EmailMap email-to-employer
 EmailMap domain-to-employer
-GroupMap hobbyists (Individual)
 GroupMap consultants (Consultant)
 GroupMap academics (Academia)