From c781b7c8b93dc0c803742c22efd37b547005fd82 Mon Sep 17 00:00:00 2001
From: Gil Forsyth <gil@forsyth.dev>
Date: Tue, 5 May 2020 08:12:59 -0400
Subject: [PATCH] Updated authorship for 0.9.18

---
 .authors.yml | 21 +++++++++++++--------
 .mailmap     |  8 +++++---
 AUTHORS.rst  |  6 ++++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.authors.yml b/.authors.yml
index 836c2d1f8..2cec2b157 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -32,7 +32,7 @@
   - jamie.bliss@ilq.com
   - jbliss@nextgenerationenrollment.com
   - jamie@ivyleav.es
-  num_commits: 212
+  num_commits: 213
   first_commit: 2016-07-20 14:05:08
   github: astronouth7303
 - name: Cody Scott
@@ -63,7 +63,7 @@
   - Gilbert.Forsyth@capitalone.com
   - gforsyth@gwu.edu
   - gil@forsyth.dev
-  num_commits: 526
+  num_commits: 529
   first_commit: 2015-10-19 16:04:32
   github: gforsyth
 - name: Morten Enemark Lund
@@ -434,7 +434,7 @@
   github: funkyfuture
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 2597
+  num_commits: 2600
   first_commit: 2015-01-21 17:04:13
   github: scopatz
 - name: anatoly techtonik
@@ -653,8 +653,8 @@
 - name: Raphael Das Gupta
   email: raphael.das.gupta@hsr.ch
   alternate_emails:
-    - git@raphael.dasgupta.ch
-  num_commits: 9
+  - git@raphael.dasgupta.ch
+  num_commits: 10
   first_commit: 2017-01-03 06:56:44
 - name: Andrei
   email: fizicars@gmail.com
@@ -952,7 +952,7 @@
   github: selepo
 - name: Bob Hyman
   email: bob.hyman@bobssoftwareworks.com
-  num_commits: 68
+  num_commits: 71
   first_commit: 2016-06-26 16:48:47
   github: bobhy
   alternate_emails:
@@ -1101,7 +1101,7 @@
   email: anki-code@users.noreply.github.com
   alternate_emails:
   - anki-code
-  num_commits: 21
+  num_commits: 26
   first_commit: 2019-10-15 18:20:58
 - name: Sylvain Corlay
   email: sylvain.corlay@gmail.com
@@ -1124,7 +1124,7 @@
   github: marciomazza
 - name: Noortheen Raja
   email: jnoortheen@gmail.com
-  num_commits: 2
+  num_commits: 3
   first_commit: 2020-03-15 10:13:56
   github: jnoortheen
 - name: Samuel Lotz
@@ -1147,5 +1147,10 @@
   first_commit: 2020-03-02 04:59:17
 - name: Manor Askenazi
   email: manor@biomedical.hosting
+  num_commits: 1
+  first_commit: 2020-04-25 18:21:05
+  github: manor
 - name: Marduk Bolaños
   email: mardukbp@mac.com
+  num_commits: 1
+  first_commit: 2020-04-30 20:26:48
diff --git a/.mailmap b/.mailmap
index 7cd46552b..7f6bb32bb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,9 +38,9 @@ Matthias Bussonnier <bussonniermatthias@gmail.com>
 Konstantin Molchanov <kmolchanov@machinezone.com> Konstantin Molchanov <moigagoo@live.com>
 Guillaume Leclerc <guillaume.leclerc@epfl.ch> Guillaume Leclerc <guillaume.leclerc.work@gmail.com>
 Gordon Ball <gordon@chronitis.net>
+anki-code <anki-code@users.noreply.github.com> anki-code <anki-code>
 Travis Shirk <travis@pobox.com>
 Joel Gerber <joel@grrbrr.ca>
-anki-code <anki-code@users.noreply.github.com> anki-code <anki-code>
 vaaaaanquish <6syun9@gmail.com> @vaaaaanquish <6syun9@gmail.com>
 vaaaaanquish <6syun9@gmail.com> vaaaaanquish <6syun9@gmail.com>
 vaaaaanquish <6syun9@gmail.com> 6syun9 <6syun9@gmail.com>
@@ -61,7 +61,7 @@ Justin Moen <jamoen7@gmail.com>
 con-f-use <con-f-use@users.noreply.github.com>
 Caleb Hattingh <caleb.hattingh@gmail.com>
 Stephan Fitzpatrick <knowsuchagency@gmail.com>
-Raphael Das Gupta <raphael.das.gupta@hsr.ch>
+Raphael Das Gupta <raphael.das.gupta@hsr.ch> Raphael Das Gupta <git@raphael.dasgupta.ch>
 K.-Michael Aye <kmichael.aye@gmail.com> K.-Michael Aye <michaelaye@users.noreply.github.com>
 Jason R. Coombs <jaraco@jaraco.com>
 halloleo <git@halloleo.dot.hailmail.dot.net> halloleo <halloleo@users.noreply.github.com>
@@ -141,6 +141,7 @@ Sébastien Pierre <sebastien.pierre@gmail.com>
 shadow-light <42055707+shadow-light@users.noreply.github.com>
 Gyuri Horak <dyuri@horak.hu>
 Jan Chren <dev.rindeal@gmail.com>
+Noortheen Raja <jnoortheen@gmail.com>
 Samuel Lotz <samuel.lotz@salotz.info>
 Mark Wiebe <mwwiebe@gmail.com>
 Nathan Hoad <nathan@getoffmalawn.com>
@@ -170,7 +171,6 @@ Allan Crooks <allan.crooks@sixtyten.org>
 micimize <rosenthalm93@gmail.com>
 Chris Lasher <chris.lasher@gmail.com>
 Edmund Miller <edmund.a.miller@protonmail.com>
-Noortheen Raja <jnoortheen@gmail.com>
 Gabriel Vogel <gabriel.vogel@online.de>
 anki <anki@code.email>
 Dan Allan <dallan@bnl.gov>
@@ -238,5 +238,7 @@ David Kalliecharan <david@david.science>
 Sylvain Corlay <sylvain.corlay@gmail.com>
 Marcio Mazza <marciomazza@gmail.com>
 Jerzy Drozdz <jerzy.drozdz@gmail.com>
+Manor Askenazi <manor@biomedical.hosting>
+Marduk Bolaños <mardukbp@mac.com>
 goodboy <tgoodlet@users.noreply.github.com>
 Atsushi Morimoto <atsushi.morimoto@dena.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 8136c704d..86d79079b 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -24,9 +24,9 @@ Authors are sorted by number of commits.
 * Konstantin Molchanov
 * Guillaume Leclerc
 * Gordon Ball
+* anki-code
 * Travis Shirk
 * Joel Gerber
-* anki-code
 * vaaaaanquish
 * Bernardas Ališauskas
 * Derek Thomas
@@ -125,6 +125,7 @@ Authors are sorted by number of commits.
 * shadow-light
 * Gyuri Horak
 * Jan Chren
+* Noortheen Raja
 * Samuel Lotz
 * Mark Wiebe
 * Nathan Hoad
@@ -154,7 +155,6 @@ Authors are sorted by number of commits.
 * micimize
 * Chris Lasher
 * Edmund Miller
-* Noortheen Raja
 * Gabriel Vogel
 * anki
 * Dan Allan
@@ -222,5 +222,7 @@ Authors are sorted by number of commits.
 * Sylvain Corlay
 * Marcio Mazza
 * Jerzy Drozdz
+* Manor Askenazi
+* Marduk Bolaños
 * goodboy
 * Atsushi Morimoto