From a988c36ccb7d411d995edfa9dbdb7682295d62a0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 8 Dec 2015 08:46:06 +0000 Subject: Add to .mailmap, and sort. --- .mailmap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 847494ba..b4956775 100644 --- a/.mailmap +++ b/.mailmap @@ -1,10 +1,9 @@ Bob Beck beck -Claudio Jeker claudio +Claudio Jeker claudio 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 @@ -12,6 +11,7 @@ Marc Espie espie Matthew Dempsky matthew Matthias Kilian kili Matthieu Herrb matthieu +Michael McConville mmcc Miod Vallat miod Nicholas Marriott Nicholas Marriott Nicholas Marriott nicm @@ -25,12 +25,12 @@ Sebastian Benoit benno Stefan Sperling stsp Stuart Henderson sthen Ted Unangst tedu -Theo de Raadt deraadt Theo de Raadt Theo Deraadt +Theo de Raadt deraadt Thomas Adam Thomas -Thomas Adam n6tadam Thomas Adam Thomas Adam -Tim van der Molen tim +Thomas Adam n6tadam +Tim van der Molen tim Tobias Stoeckmann tobias Todd C Miller millert William Yodlowsky william -- cgit v1.2.3