summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2015-12-08 08:46:06 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2015-12-08 08:46:06 +0000
commita988c36ccb7d411d995edfa9dbdb7682295d62a0 (patch)
tree22dc26cd0223a7eaf62e191735c857e4b49d8750 /.mailmap
parent3182728b70a76d3d2afb6dedf7ae2769d7491c23 (diff)
Add to .mailmap, and sort.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap10
1 files changed, 5 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap
index 847494ba..b4956775 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +1,9 @@
Bob Beck <beck@openbsd.org> beck <beck>
-Claudio Jeker <claudio@openbsd.org> claudio <claudio>
+Claudio Jeker <claudio@openbsd.org> claudio <claudio>
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>
@@ -12,6 +11,7 @@ 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>
+Michael McConville <mmcc@openbsd.org> mmcc <mmcc>
Miod Vallat <miod@openbsd.org> miod <miod>
Nicholas Marriott <nicholas.marriott@gmail.com> Nicholas Marriott <nicm@openbsd.org>
Nicholas Marriott <nicholas.marriott@gmail.com> nicm <nicm>
@@ -25,12 +25,12 @@ 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 de Raadt <deraadt@openbsd.org> deraadt <deraadt>
Theo de Raadt <deraadt@openbsd.org> Theo Deraadt <deraadt@openbsd.org>
+Theo de Raadt <deraadt@openbsd.org> deraadt <deraadt>
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>
-Tim van der Molen <tim@openbsd.org> tim <tim>
+Thomas Adam <thomas@xteddy.org> n6tadam <n6tadam@xteddy.org>
+Tim van der Molen <tim@openbsd.org> tim <tim>
Tobias Stoeckmann <tobias@openbsd.org> tobias <tobias>
Todd C Miller <millert@openbsd.org> millert <millert>
William Yodlowsky <william@openbsd.org> william <william>