better mailman, tweaks to CREDITS

.mailmap

@@ -1,38 +1,73 @@
+Abdelrahman Hussein <abdelrahman@skydiver.(none)>
+A. T. Hofkamp <[email protected]>
+Amber Yust <[email protected]> <[email protected]>
+Andrew Melo <[email protected]> <[email protected]>
+Aurélien Bompard <[email protected]>
+Ben Hearsum <[email protected]> <[email protected]>
+Ben Hearsum <[email protected]> <[email protected]>
+Ben Hearsum <[email protected]> <bhearsum@voot.(none)>
+Benoît Allard <[email protected]>
+Benoît Allard <[email protected]> <[email protected]>
+Benoît Allard <[email protected]> <[email protected]>
 Brian Warner <[email protected]>
+Brian Warner <[email protected]> <[email protected]>
 Brian Warner <[email protected]> <warner>
 Brian Warner <[email protected]> <[email protected]>
-Brian Warner <[email protected]> <[email protected]>
-Dustin J. Mitchell <[email protected]> <[email protected]>
-Dustin J. Mitchell <[email protected]> <[email protected]>
-Dustin J. Mitchell <[email protected]>
-Marcus Lindblom <[email protected]>
-Marc-Antoine Ruel <[email protected]>
-Steve "Ashcrow" Milner <[email protected]> <[email protected]>
-Daniel Dunbar <[email protected]> <[email protected]>
-Ian Zimmerman <[email protected]> <[email protected]> 
-Joshua Kugler <[email protected]> <[email protected]>
-Zooko Wilcox-O'Hearn <[email protected]>
-Randall Bosetti <[email protected]> <randall@alyosha.(none)>
-Randall Bosetti <[email protected]>
-Stefan Seefeld <[email protected]>
-Stefan Seefeld <[email protected]> <stefan@quasimodo.(none)>
-Ben Hearsum <[email protected]> <[email protected]>
-Ben Hearsum <[email protected]> <bhearsum@voot.(none)>
+Chad S Metcalf <[email protected]>
+Charles Lepple <[email protected]> <[email protected]>
+Chris Soyars <[email protected]>
+Dan Scott <[email protected]> <[email protected]>
 Daniel Dunbar <[email protected]> <[email protected]>
+Daniel Dunbar <[email protected]> <[email protected]>
 Douglas Hubler <dhubler@bigbird.(none)> <dhubler@localhost.(none)>
+Dustin J. Mitchell <[email protected]>
+Dustin J. Mitchell <[email protected]> <[email protected]>
+Dustin J. Mitchell <[email protected]> <[email protected]>
 Gary Poster <[email protected]> <gary@gary-ubuntu.(none)>
 Gary Poster <[email protected]> <[email protected]>
+Georges Racinet <[email protected]> <gracinet@ishtar.(none)>
 Geraud Boyer <[email protected]> <geraud@sparkle.(none)>
-Kristian Nielsen <[email protected]> <[email protected]>
-Nicolas Sylvain <[email protected]> <[email protected]>
+Greg Ward <[email protected]> <[email protected]>
+Ian Zimmerman <[email protected]> <[email protected]>
+Ian Zimmerman <[email protected]> <[email protected]> 
+John Carr <[email protected]> <[email protected]>
+John Ford <[email protected]> <[email protected]>
 John O'Duinn <[email protected]>
-Quentin Raynaud <[email protected]> <[email protected]>
-Rene Müller <[email protected]>
-Rene Müller <[email protected]> <[email protected]> 
-Neil Hemingway <[email protected]>
-Neil Hemingway <[email protected]> <[email protected]>
+Jon Olsson <[email protected]> <[email protected]>
+Jonathan S. Romero <jonnyro@jonnyro-desktop.(none)> <jonnyro@disti-vm-jromero-ubuntu-workstation.(none)>
+Joshua Kugler <[email protected]> <[email protected]>
+Justin Wood <[email protected]>
+Justin Wood <[email protected]> <[email protected]>
+Justin Wood <[email protected]> Justin Wood <[email protected]>
+Kristian Nielsen <[email protected]> <[email protected]>
+Lital Natan <[email protected]> <[email protected]>
+Louis Opter <[email protected]> <[email protected]>
+Louis Opter <[email protected]> <[email protected]>
+Marc-Antoine Ruel <[email protected]>
+Marc-Antoine Ruel <[email protected]> <[email protected]>
+Marcus Lindblom <[email protected]>
+Mark Lakewood <[email protected]>
+Mark Lakewood <[email protected]> <markl@markl-desktop.(none)>
+Matisse Enzer <[email protected]> <[email protected]>
 Michael MacDonald <[email protected]>
 Michael MacDonald <[email protected]> <[email protected]>
-A. T. Hofkamp <[email protected]>
-Justin Wood <[email protected]> <[email protected]>
-Justin Wood <[email protected]>
+Nate Bragg <[email protected]>
+Neil Hemingway <[email protected]>
+Neil Hemingway <[email protected]> <[email protected]>
+Nicolas Sylvain <[email protected]> <[email protected]>
+Pierre Tardy <[email protected]> <[email protected]>
+Quentin Raynaud <[email protected]> <[email protected]>
+Randall Bosetti <[email protected]>
+Randall Bosetti <[email protected]> <randall@alyosha.(none)>
+Rene Müller <[email protected]>
+Rene Müller <[email protected]> <[email protected]> 
+Scott Garman <[email protected]> <[email protected]>
+Stefan Seefeld <[email protected]>
+Stefan Seefeld <[email protected]> <stefan@quasimodo.(none)>
+Stefan Zager <[email protected]> <[email protected]>
+Steve "Ashcrow" Milner <[email protected]> <[email protected]>
+William Deegan <[email protected]> <[email protected]>
+Zooko Wilcox-O'Hearn <[email protected]>
+adam <[email protected]> <adam@bastard.(none)>
+Harry Borkhuis <[email protected]>
+Andy Howell <[email protected]>

master/CREDITS

@@ -42,7 +42,6 @@ Brandon R. Stoner
 Brett Neely
 Brian Campbell
 Brian Warner
-Chad Metcalf
 Chad S Metcalf
 Charles Davis
 Charles Hardin
@@ -205,7 +204,7 @@ Quentin Raynaud
 Rafaël Carré
 Randall Bosetti
 Renato Alves
-Rene Mueller
+Rene Müller
 Rene Rivera
 Riccardo Magliocchetti
 Richard Holden
@@ -228,9 +227,11 @@ Simon Kennedy
 Stanislav Kupryakhin
 Stefan Marr
 Stefan Seefeld
+Stefan Zager
 Stephen Davis
 Steve "Ashcrow" Milner
 Steven Walter
+Stuart Auchterlonie
 Ted Mielczarek
 Terence Haddock
 Thijs Triemstra