diff options
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -6,6 +6,7 @@ Aliaksandr Rahalevich <saksmlz@gmail.com> Andrew Couch <andy@couchand.com> <acouch@bluewolf.com> Andrew Newcomb <ext.github@preceptsoftware.co.uk> Andrew Powell <powella@gmail.com> <andrew@shellscape.org> +Andrew Powell <powella@gmail.com> <andrew@shellcape.org> Andrey Kapitcyn <ru.m157y@gmail.com> Ben Hollis <bhollis@amazon.com> <ben@benhollis.net> Benjamin Scott Boyle <benjamins.boyle@gmail.com> @@ -15,12 +16,13 @@ Christoph Rönsch <christoph.roensch@arcor.de> Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net> Courtland Allen <courtlandallen@gmail.com> Dan Streetman <ddstreet@ieee.org> +Danny Trunk <dtrunk90@gmail.com> <dtrunk90@googlemail.com> Diego Tres <diegotres@gmail.com> Dominique Vincent <dominique.vincent@toitl.com> Doug Blood <dougblood@gmail.com> Douglas Cerna <douglascerna@yahoo.com> <replaceafill@system76.(none)> -Douglas Neiner <doug@pixelgraphics.us> -Douglas Neiner <doug@pixelgraphics.us> <doug@Doug-Neiners-MacBook-Pro.local> +Douglas Neiner <doug@dougneiner.com> <doug@pixelgraphics.us> +Douglas Neiner <doug@dougneiner.com> <doug@Doug-Neiners-MacBook-Pro.local> Dylan Just <dev@ephox.com> Eddie Monge <eddie@eddiemonge.com> Edward A Faulkner <ef@alum.mit.edu> @@ -38,6 +40,7 @@ Igor Milla <igor.fsp.milla@gmail.com> Israel Tsadok <itsadok@gmail.com> Jacek Jędrzejewski <jacek.jedrzejewski@gmail.com> Jamie Gegerson <git@jamiegegerson.com> +Jason Oster <jay@kodewerx.org> <jay@loyalize.com> Jay Merrifield <fracmak@gmail.com> <merrifieldj@pixia.com> John Enters <github@darkdark.net> Jonathan Vingiano <jvingiano@gmail.com> @@ -47,16 +50,20 @@ Justin MacCarthy <Justin@Rubystars.biz> Jörn Zaefferer <joern.zaefferer@gmail.com> Karl Kirch <karlkrch@gmail.com> <karl.ctr.kirch@faa.gov> Kevin Dalman <development@allpro.net> -Klaus Hartl <klaus.hartl@googlemail.com> carhartl <klaus.hartl@stilbuero.de> +Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@googlemail.com> +Klaus Hartl <klaus.hartl@gmail.com> <klaus.hartl@stilbuero.de> Kris Borchers <kris.borchers@gmail.com> Kris Borchers <kris.borchers@gmail.com> <k_borchers@yahoo.com> Krzysztof Rosiński <rozwell69@gmail.com> Lev Kitsis <spam4lev@gmail.com> -Maggie Costello Wachs <fg.maggie@gmail.com> maggiewachs <maggie@filamentgroup.com> +Maciej Mroziński <maciej.k.mrozinski@gmail.com> <mrozik87@gmail.com> +Maggie Wachs <maggie@filamentgroup.com> +Maggie Wachs <maggie@filamentgroup.com> <fg.maggie@gmail.com> Marc Neuwirth <marc.neuwirth@gmail.com> Marcos Sousa <falecomigo@marcossousa.com> <marcos.sousa@corp.globo.com> Martin Frost <martinf55@hotmail.com> Mathias Stenbom <mathias@stenbom.com> +Matt Hoskins <matt@nipltd.com> <furlined@cat-basket.org> Matthew Edward Hutton <meh@corefiling.co.uk> Max Schnur <max.schnur@gmail.com> Michael Hollis <hollis21@gmail.com> @@ -66,6 +73,7 @@ Mike Alsup <malsup@gmail.com> Milan Broum <midlis@googlemail.com> Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr> <cherif@cherif.(none)> Nick Pierpoint <nick.pierpoint@tidalsand.com> +Paul Bakaus <paul.bakaus@gmail.com> <paul.bakaus@googlemail.com> Paul Irish <paul.irish@gmail.com> Pavol Hluchý <lopo@losys.sk> Peter Heiberg <peter@heiberg.se> @@ -78,6 +86,7 @@ Rick Waldron <waldron.rick@gmail.com> Ryan Neufeld <ryan@neufeldmail.com> Ryan Olton <oltonr@gmail.com> Saji Nediyanchath <saji89@gmail.com> Saji <saji@saji-laptop.(none)> +Scott Jehl <scottjehl@gmail.com> <scott@scottjehl.com> Sebastian Sauer <info@dynpages.de> Sergey Kartashov <ebishkek@yandex.ru> Shahyar Ghobadpour <shahyar@gmail.com> @@ -90,3 +99,4 @@ Thibault Duplessis <thibault.duplessis@gmail.com> Ting Kuei <ting@kuei.com> Wesley Walser <waw325@gmail.com> <wwalser@atlassian.com> Xavi Ramirez <xavi.rmz@gmail.com> +Ziling Zhao <zilingzhao@gmail.com> <zizhao@cisco.com> |