diff options
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -11,6 +11,7 @@ Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com> Cal Turney <cturney@charter.net> cturney <cturney@charter.net> Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com> Chris Dunlop <chris.dunlop3@gmail.com> cjdunlop +Chris Maynard <Christopher.Maynard@GTECH.COM> <Christopher.Maynard@igt.com> Christian M. Amsüss <chrysn@fsfe.org> chrysn <chrysn@fsfe.org> Christoph Jähnigen <nuabaranda@web.de> desolat <nuabaranda@web.de> Claudius Zingerli <czingerl@gmail.com> zeuz <czingerl@gmail.com> @@ -25,6 +26,7 @@ Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com> Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com> Gerald Combs <gerald@wireshark.org> <gerald@zing.org> Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com> +Gloria Pozuelo <gloria.pozuelo@bics.com> glores <gloria.pozuelo@bics.com> Graeme Lunt <graeme.lunt@smhs.co.uk> gal <graeme.lunt@smhs.co.uk> Greg Morris <GMORRIS@novell.com> gmor1207@gmail.com <gmor1207@gmail.com> Guy Davies <aguydavies@gmail.com> guydavies <aguydavies@gmail.com> @@ -38,12 +40,15 @@ Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@localhost> Irene Rüngeler <ruengeler@wireshark.org> <ruengeler@MacBookIrene.local> Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org> Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl> +Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com> Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com> -Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com> Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com> +João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt> John Miner <optommp@gmail.com> John <optommp@gmail.com> Jorge Power <jpower@rsscorp.org> jorge power +Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de> +Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de> Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com> Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com> Krishna Chaitanya <chaitanya.mgit@gmail.com> tkc <chaitanya.mgit@gmail.com> @@ -51,11 +56,12 @@ Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation Lukas Emersberger <lukas.emersberger@gmail.com> <lukas.emersberger@br-automation.com> Marcel Essig <marcel.essig@gmx.de> <essig.marcel@gmail.com> Marian Ďurkovič <md@bts.sk> Marian Durkovic +Martin Kaiser <wireshark@kaiser.cx> <martin.kaiser@paytec.ch> Martin Kaiser <wireshark@kaiser.cx> <martin@reykholt.kaiser.cx> Martin Kaiser <wireshark@kaiser.cx> <martin@skogar.kaiser.cx> -Martin Tibensky <martin.tibensky@alcatel-lucent.com> matibens +Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens Martin Tibenský <martin.tibensky@alcatel-lucent.com> matibens <martin.tibensky@alcatel-lucent.com> -Martin Tibensky <martin.tibensky@alcatel-lucent.com> Mato <tibensky233@gmail.com> +Martin Tibenský <martin.tibensky@alcatel-lucent.com> <tibensky233@gmail.com> Michael Oed <michael.oed@gmail.com> Mike78 <michael.oed@gmail.com> Michael Tüxen <tuexen@wireshark.org> <tuexen@fh-muenster.de> Michael Tüxen <tuexen@wireshark.org> <tuexen@mba.local> |