summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-06-04 11:36:44 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-06-04 11:36:44 +0100
commitd058e963fda8a4847cd572e5fb62cd851fdec69a (patch)
treec5a7fa1f3a4553bc39159e01ecf4bac5cc487bdc /.mailmap
parent13808ccedec226db127c3419ee8c53b6eabb9cd9 (diff)
Update mailmap.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap18
1 files changed, 14 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index a7a401ff..3b43fa18 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,24 +1,34 @@
Bob Beck <beck@openbsd.org> beck <beck>
Igor Sobrado <sobrado@openbsd.org> sobrado <sobrado>
+Ingo Schwarze <schwarze@openbsd.org> schwarze <schwarze>
Jacek Masiulaniec <jacekm@openbsd.org> jacekm <jacekm>
+Jason McIntyre <jmc@openbsd.org> jmc <jmc>
Jason McIntyre <jmc@openbsd.org> jcm <jcm>
Joel Sing <jsing@openbsd.org> jsing <jsing>
+Jonathan Gray <jsg@openbsd.org> jsg <jsg>
+Kenneth R Westerback <krw@openbsd.org> krw <krw>
Marc Espie <espie@openbsd.org> espie <espie>
Matthew Dempsky <matthew@openbsd.org> matthew <matthew>
Matthias Kilian <kili@openbsd.org> kili <kili>
Matthieu Herrb <matthieu@openbsd.org> matthieu <matthieu>
Miod Vallat <miod@openbsd.org> miod <miod>
-Nicholas Marriott <nicm@openbsd.org> nicm <nicm>
-Nicholas Marriott <nicm@openbsd.org> no_author <no_author@example.org>
-<nicm@openbsd.org> <nicholas.marriott@gmail.com>
+Nicholas Marriott <nicholas.marriott@gmail.com> Nicholas Marriott <nicm@openbsd.org>
+Nicholas Marriott <nicholas.marriott@gmail.com> nicm <nicm>
+Nicholas Marriott <nicholas.marriott@gmail.com> no_author <no_author@example.org>
Okan Demirmen <okan@openbsd.org> okan <okan>
Philip Guenther <guenther@openbsd.org> guenther <guenther>
Pierre-Yves Ritschard <pyr@openbsd.org> pyr <pyr>
Ray Lai <ray@openbsd.org> ray <ray>
Ryan McBride <mcbride@openbsd.org> mcbride <mcbride>
+Sebastian Benoit <benno@openbsd.org> benno <benno>
Stefan Sperling <stsp@openbsd.org> stsp <stsp>
Stuart Henderson <sthen@openbsd.org> sthen <sthen>
Ted Unangst <tedu@openbsd.org> tedu <tedu>
-Theo Deraadt <deraadt@openbsd.org> deraadt <deraadt>
+Theo de Raadt <deraadt@openbsd.org> deraadt <deraadt>
+Theo de Raadt <deraadt@openbsd.org> Theo Deraadt <deraadt@openbsd.org>
Thomas Adam <thomas@xteddy.org> Thomas <thomas@xteddy.org>
+Thomas Adam <thomas@xteddy.org> n6tadam <n6tadam@xteddy.org>
+Thomas Adam <thomas@xteddy.org> Thomas Adam <thomas.adam@smoothwall.net>
+Tobias Stoeckmann <tobias@openbsd.org> tobias <tobias>
+Todd C Miller <millert@openbsd.org> millert <millert>
William Yodlowsky <william@openbsd.org> william <william>