From d058e963fda8a4847cd572e5fb62cd851fdec69a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 4 Jun 2015 11:36:44 +0100 Subject: Update mailmap. --- .mailmap | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index a7a401ff..3b43fa18 100644 --- a/.mailmap +++ b/.mailmap @@ -1,24 +1,34 @@ Bob Beck beck Igor Sobrado sobrado +Ingo Schwarze schwarze Jacek Masiulaniec jacekm +Jason McIntyre jmc Jason McIntyre jcm Joel Sing jsing +Jonathan Gray jsg +Kenneth R Westerback krw Marc Espie espie Matthew Dempsky matthew Matthias Kilian kili Matthieu Herrb matthieu Miod Vallat miod -Nicholas Marriott nicm -Nicholas Marriott no_author - +Nicholas Marriott Nicholas Marriott +Nicholas Marriott nicm +Nicholas Marriott no_author Okan Demirmen okan Philip Guenther guenther Pierre-Yves Ritschard pyr Ray Lai ray Ryan McBride mcbride +Sebastian Benoit benno Stefan Sperling stsp Stuart Henderson sthen Ted Unangst tedu -Theo Deraadt deraadt +Theo de Raadt deraadt +Theo de Raadt Theo Deraadt Thomas Adam Thomas +Thomas Adam n6tadam +Thomas Adam Thomas Adam +Tobias Stoeckmann tobias +Todd C Miller millert William Yodlowsky william -- cgit v1.2.3