From acc73e5c294f196eea2be68f3d65e90c6c8edab1 Mon Sep 17 00:00:00 2001
From: Connor Martin <connormartin7@gmail.com>
Date: Mon, 26 Oct 2020 10:42:51 -0500
Subject: [PATCH] Updated authorship for 3.20.5

---
 .authors.yml | 8 ++++----
 .mailmap     | 6 +++---
 AUTHORS.txt  | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.authors.yml b/.authors.yml
index f324ec6e51..2e3316fe98 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -18,7 +18,7 @@
   email: isuruf@gmail.com
   alternate_emails:
   - isuru.11@cse.mrt.ac.lk
-  num_commits: 52
+  num_commits: 62
   first_commit: 2017-06-16 15:14:34
   github: isuruf
 - name: Dan Blanchard
@@ -414,7 +414,7 @@
 - name: Ray Donnelly
   email: mingw.android@gmail.com
   github: mingwandroid
-  num_commits: 578
+  num_commits: 599
   first_commit: 2016-03-06 18:52:51
 - name: Paul Madden
   email: maddenp@colorado.edu
@@ -1117,11 +1117,11 @@
   first_commit: 2020-06-24 10:55:13
 - name: Ken Odegard
   email: ken.odegard@gmail.com
-  num_commits: 8
+  num_commits: 10
   first_commit: 2020-09-08 19:53:41
   github: njalerikson
 - name: Connor Martin
   email: connormartin7@gmail.com
-  num_commits: 4
+  num_commits: 8
   first_commit: 2020-10-01 20:48:45
   github: cjmartian
diff --git a/.mailmap b/.mailmap
index 6362522413..97b8764b94 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,8 +21,8 @@ Kale Franz <kfranz@continuum.io> Kale Franz <kalefranz@users.noreply.github.com>
 Rachel <rrigdon@anaconda.com>
 Marcelo Duarte Trevisani <marceloduartetrevisani@gmail.com> Marcelo Duarte Trevisani <marcelotrevisani@users.noreply.github.com>
 sophia <scastellarin95@gmail.com>
-John Kirkham <kirkhamj@janelia.hhmi.org>
 Isuru Fernando <isuruf@gmail.com> Isuru Fernando <isuru.11@cse.mrt.ac.lk>
+John Kirkham <kirkhamj@janelia.hhmi.org>
 Stuart Berg <bergs@janelia.hhmi.org>
 Ryan Grout <ryan@ryangrout.org> Ryan Grout <rgrout@continuum.io>
 Ryan Grout <ryan@ryangrout.org> Ryan Grout <groutr@users.noreply.github.com>
@@ -56,12 +56,13 @@ Jillian Rowe <jillian.e.rowe@gmail.com> jerowe <jillian.e.rowe@gmail.com>
 Almar Klein <almar.klein@gmail.com>
 Julian Rüth <julian.rueth@fsfe.org>
 Alex Ford <a.sewall.ford@gmail.com>
+Ken Odegard <ken.odegard@gmail.com>
 John Blischak <jdblischak@gmail.com>
 Scheah <scheah@zendesk.com>
 Alexander Sturm <13468347+alexandersturm@users.noreply.github.com>
 neok-m4700 <neok-m4700@users.noreply.github.com>
 Christopher Burr <christopher.burr@cern.ch> Chris Burr <chrisburr@users.noreply.github.com>
-Ken Odegard <ken.odegard@gmail.com>
+Connor Martin <connormartin7@gmail.com>
 Richard Frank <rich@quantopian.com>
 Filipe Fernandes <ocefpaf@gmail.com> ocefpaf <ocefpaf@gmail.com>
 Matthieu Dartiailh <marul@laposte.net> MatthieuDartiailh <marul@laposte.net>
@@ -101,7 +102,6 @@ Yu Feng <rainwoodman@gmail.com>
 Julien Schueller <schueller@phimeca.com>
 Toon Verstraelen <Toon.Verstraelen@UGent.be>
 Duncan Macleod <duncan.macleod@ligo.org>
-Connor Martin <connormartin7@gmail.com>
 Matty G <meawoppl@gmail.com> meawoppl <meawoppl@gmail.com>
 Robert T. McGibbon <rmcgibbo@gmail.com> Robert McGibbon <rmcgibbo@gmail.com>
 chapmanb <chapmanb@50mail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index b53bdc9b9a..1becc44f15 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -11,8 +11,8 @@ Authors are sorted by number of commits.
 * Rachel
 * Marcelo Duarte Trevisani
 * sophia
-* John Kirkham
 * Isuru Fernando
+* John Kirkham
 * Stuart Berg
 * Ryan Grout
 * Rachel Rigdon
@@ -45,12 +45,13 @@ Authors are sorted by number of commits.
 * Almar Klein
 * Julian Rüth
 * Alex Ford
+* Ken Odegard
 * John Blischak
 * Scheah
 * Alexander Sturm
 * neok-m4700
 * Christopher Burr
-* Ken Odegard
+* Connor Martin
 * Richard Frank
 * Filipe Fernandes
 * Matthieu Dartiailh
@@ -90,7 +91,6 @@ Authors are sorted by number of commits.
 * Julien Schueller
 * Toon Verstraelen
 * Duncan Macleod
-* Connor Martin
 * Matty G
 * Robert T. McGibbon
 * chapmanb