Updated authorship for 3.18.3

.authors.yml

@@ -5,7 +5,7 @@
   - [email protected]
   aliases:
   - Mike Sarahan
-  num_commits: 78
+  num_commits: 114
   first_commit: 2015-09-04 21:31:08
 - name: Jonathan J. Helmus
   email: [email protected]
@@ -180,7 +180,7 @@
   email: [email protected]
   alternate_emails:
   - [email protected]
-  num_commits: 2
+  num_commits: 6
   first_commit: 2018-02-22 13:07:33
   github: mariusvniekerk
 - name: Travis Oliphant
@@ -414,7 +414,7 @@
 - name: Ray Donnelly
   email: [email protected]
   github: mingwandroid
-  num_commits: 397
+  num_commits: 412
   first_commit: 2016-03-06 18:52:51
 - name: Paul Madden
   email: [email protected]
@@ -742,7 +742,7 @@
   github: gqmelo
 - name: soapy1
   email: [email protected]
-  num_commits: 6
+  num_commits: 11
   first_commit: 2018-10-22 16:40:33
   github: soapy1
 - name: Yu Feng
@@ -890,12 +890,12 @@
   first_commit: 2019-01-26 13:17:33
 - name: Rachel
   email: [email protected]
-  num_commits: 47
+  num_commits: 54
   first_commit: 2019-01-24 14:12:19
   github: rrigdon
 - name: Rachel Rigdon
   email: [email protected]
-  num_commits: 21
+  num_commits: 31
   first_commit: 2019-01-24 15:12:09
   github: rrigdon
 - name: Zane Dufour
@@ -971,3 +971,16 @@
   github: spalmrot-tic
 - name: John Kirkham
   email: [email protected]
+  num_commits: 5
+  first_commit: 2019-06-06 14:26:02
+  github: jakirkham
+- name: Daniel Bast
+  email: [email protected]
+  num_commits: 3
+  first_commit: 2019-06-07 02:44:13
+  github: dbast
+- name: Duncan Macleod
+  email: [email protected]
+  num_commits: 1
+  first_commit: 2019-06-13 08:07:25
+  github: duncanmmacleod

.mailmap

@@ -13,20 +13,21 @@ Aaron Meurer <[email protected]>
 Ray Donnelly <[email protected]>
 Ilan Schnell <[email protected]> Ilan Schnell <[email protected]>
 Ilan Schnell <[email protected]> Ilan Schnell <[email protected]>
+Michael Sarahan <[email protected]> Mike Sarahan <[email protected]>
 Dan Blanchard <[email protected]> Daniel Blanchard <[email protected]>
 Dan Blanchard <[email protected]> Daniel Blanchard <[email protected]>
 Kale Franz <[email protected]> Kale Franz <[email protected]>
 sophia <[email protected]>
-Michael Sarahan <msarahan@gmail.com> Mike Sarahan <[email protected]>
+Rachel <rrigdon@anaconda.com>
 John Kirkham <[email protected]>
 Stuart Berg <[email protected]>
-Rachel <[email protected]>
 Ryan Grout <[email protected]> Ryan Grout <[email protected]>
 Ryan Grout <[email protected]> Ryan Grout <[email protected]>
 Darren Dale <[email protected]>
 Jonathan J. Helmus <[email protected]> Jonathan Helmus <[email protected]>
 Travis Swicegood <[email protected]> Travis Swicegood <[email protected]>
 Nehal J Wani <[email protected]>
+Rachel Rigdon <[email protected]>
 Matt Craig <[email protected]> Matthew Craig <[email protected]>
 Johannes Köster <[email protected]>
 Anthony Scopatz <[email protected]>
@@ -35,7 +36,6 @@ Mandeep Bhutani <[email protected]> mandeep <[email protected]
 Patrick Snape <[email protected]> Patrick Snape <[email protected]>
 Sean <[email protected]> srossross <[email protected]>
 Travis Oliphant <[email protected]> Travis E. Oliphant <[email protected]>
-Rachel Rigdon <[email protected]>
 Harsh Gupta <[email protected]>
 Jasmine Sandhu <[email protected]>
 Matthias Gabriel <[email protected]>
@@ -44,6 +44,7 @@ Isuru Fernando <[email protected]> Isuru Fernando <[email protected]>
 Alex Wiltschko <[email protected]>
 Min RK <[email protected]> MinRK <[email protected]>
 Ullrich Koethe <[email protected]>
+soapy1 <[email protected]>
 Phil Elson <[email protected]> pelson <[email protected]>
 Jillian Rowe <[email protected]> jerowe <[email protected]>
 Almar Klein <[email protected]>
@@ -57,13 +58,13 @@ neok-m4700 <[email protected]>
 Richard Frank <[email protected]>
 Filipe Fernandes <[email protected]> ocefpaf <[email protected]>
 Matthieu Dartiailh <[email protected]> MatthieuDartiailh <[email protected]>
+Marius van Niekerk <[email protected]> Marius van Niekerk <[email protected]>
 Christoph Buchner <[email protected]>
 Brent Pedersen <[email protected]>
 James Abbott <[email protected]>
 Patrick Sodré <[email protected]>
 Bruno Oliveira <[email protected]>
 Bryan W. Weber <[email protected]>
-soapy1 <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Mario Juric <[email protected]> Mario Juric <[email protected]>
 Ivan Kalev <[email protected]> ikalev <[email protected]>
@@ -73,6 +74,7 @@ Elliot Hughes <[email protected]>
 Amir MOHAMMADI <[email protected]>
 Chris Hogan <[email protected]>
 Christopher Burr <[email protected]> Chris Burr <[email protected]>
+John Kirkham <[email protected]>
 Heather Kelly <[email protected]> heather999 <[email protected]>
 Geir Ove Myhr <[email protected]>
 Matt Rendina <[email protected]>
@@ -100,8 +102,8 @@ Martin Bergtholdt <[email protected]>
 Eric Dill <[email protected]>
 Derek Ludwig <[email protected]>
 Vlad Frolov <[email protected]>
+Daniel Bast <[email protected]>
 todd.m.tomashek <[email protected]> tomashek <[email protected]>
-Marius van Niekerk <[email protected]> Marius van Niekerk <[email protected]>
 Michael Cormier <[email protected]>
 Siu Kwan Lam <[email protected]>
 whitequark <[email protected]>
@@ -193,3 +195,4 @@ Uilian Ries <[email protected]>
 Jayaramchandar Pazhanikumar <[email protected]>
 Shaun Walbridge <[email protected]>
 spalmrot-tic <[email protected]>
+Duncan Macleod <[email protected]>

AUTHORS.txt

@@ -4,18 +4,19 @@ Authors are sorted by number of commits.
 * Aaron Meurer
 * Ray Donnelly
 * Ilan Schnell
+* Michael Sarahan
 * Dan Blanchard
 * Kale Franz
 * sophia
-* Michael Sarahan
+* Rachel
 * John Kirkham
 * Stuart Berg
-* Rachel
 * Ryan Grout
 * Darren Dale
 * Jonathan J. Helmus
 * Travis Swicegood
 * Nehal J Wani
+* Rachel Rigdon
 * Matt Craig
 * Johannes Köster
 * Anthony Scopatz
@@ -24,7 +25,6 @@ Authors are sorted by number of commits.
 * Patrick Snape
 * Sean
 * Travis Oliphant
-* Rachel Rigdon
 * Harsh Gupta
 * Jasmine Sandhu
 * Matthias Gabriel
@@ -33,6 +33,7 @@ Authors are sorted by number of commits.
 * Alex Wiltschko
 * Min RK
 * Ullrich Koethe
+* soapy1
 * Phil Elson
 * Jillian Rowe
 * Almar Klein
@@ -46,13 +47,13 @@ Authors are sorted by number of commits.
 * Richard Frank
 * Filipe Fernandes
 * Matthieu Dartiailh
+* Marius van Niekerk
 * Christoph Buchner
 * Brent Pedersen
 * James Abbott
 * Patrick Sodré
 * Bruno Oliveira
 * Bryan W. Weber
-* soapy1
 * Thomas A Caswell
 * Mario Juric
 * Ivan Kalev
@@ -62,6 +63,7 @@ Authors are sorted by number of commits.
 * Amir MOHAMMADI
 * Chris Hogan
 * Christopher Burr
+* John Kirkham
 * Heather Kelly
 * Geir Ove Myhr
 * Matt Rendina
@@ -89,8 +91,8 @@ Authors are sorted by number of commits.
 * Eric Dill
 * Derek Ludwig
 * Vlad Frolov
+* Daniel Bast
 * todd.m.tomashek
-* Marius van Niekerk
 * Michael Cormier
 * Siu Kwan Lam
 * whitequark
@@ -182,5 +184,6 @@ Authors are sorted by number of commits.
 * Jayaramchandar Pazhanikumar
 * Shaun Walbridge
 * spalmrot-tic
+* Duncan Macleod