Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 30 insertions, 45 deletions

diff --git a/.mailmap b/.mailmap
index ee02e960..9d753f39 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,47 +1,32 @@
-Ali-G <gauvain.dauchy@free.fr> ali-g <gauvain.dauchy@free.fr>
-Ali-G <gauvain.dauchy@free.fr> Ali-G <gauvain@devil.(none)>
-Ali-G <gauvain.dauchy@free.fr> alige Ali-G <aligetmw@hotmail.fr>
-Bjørn Lindeijer <bjorn@lindeijer.nl> Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
-Bjørn Lindeijer <bjorn@lindeijer.nl> Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
-Chuck Miller <shadowmil@gmail.com> Charles Miller <shadowmil@gmail.com>
-Coffee <coffee@coffee-EP45-UD3L.(none)> coffee <coffee@coffee-EP45-UD3L.(none)>
-Coffee <coffee@coffee-EP45-UD3L.(none)> Coffee <coffee@coffee-ep45-ud3l.(none)>
-Coffee <coffee@coffee-EP45-UD3L.(none)> cafe <cafe@cafe-EP45-UD3L.(none)>
-Darky <dark_mage.87@mail.ru> Dark_Mage <dark_mage.87@mail.ru>
-Darky <dark_mage.87@mail.ru> Darky <developer@Pirat.(none)>
-Darky <dark_mage.87@mail.ru> Darky <rf_online@mail.ru>
-Darky <dark_mage.87@mail.ru> Developer <developer@Pirat.(none)>
-Dennis Friis <peavey@inspircd.org> Dennis Friis <peavey@placid.dk>
-Dennis Friis <peavey@inspircd.org> peavey <peavey@inspircd.org>
-Enchilado <crunchy@crunchy-Satellite-L300.(none)> crunchy <crunchy@crunchy-Satellite-L300.(none)>
-Enchilado <crunchy@crunchy-Satellite-L300.(none)> Enchilado <crunchy@crunchy-satellite-l300.(none)>
-Enchilado <crunchy@crunchy-Satellite-L300.(none)> Enchilado <pheonixvania@gmail.com>
-Enchilado <crunchy@crunchy-Satellite-L300.(none)> enchilado <www.e.sayers@gmail.com>
-Fate <fate-tmw@googlemail.com> Fate <fate@kino.cs.colorado.edu>
-Fate <fate-tmw@googlemail.com> Fate <fate.tmw@googlemail.com>
-Freeyorp <Freeyorp101@hotmail.com> Freeyorp <freeyorp101@hotmail.com>
-Freeyorp <Freeyorp101@hotmail.com> Freeyorp <Freeyorp101@NOSPAM@hotmail.com>
-Freeyorp <Freeyorp101@hotmail.com> Freeyorp <TheFreeYorp+github@gmail.com>
-Jarrett Thomas-Huxley <fotherjarrett@gmail.com> fother <fotherjarrett@gmail.com>
-Jessica Tölke <jtoelke@mail.upb.de> jtoelke <jtoelke@gmx.de>
-Joseph Greene <fluffyanddeadly999@gmail.com> Pihro <fluffyanddeadly999@gmail.com>
-meways <mewaysID@yahoo.com> Meway <meway@meway.dyndns.org>
-meways <mewaysID@yahoo.com> meways <mewaysid@yahoo.com>
-remoitnane <remoit(DOT)nane(AT)gmail(DOT)com> No Name <remoit(DOT)nane(AT)gmail(DOT)com>
-remoitnane <remoit(DOT)nane(AT)gmail(DOT)com> remoitnane <remoit(dot)nane(at)gmail(dot)com>
-Stefan Dombrowski <stefan@uni-bonn.de> Stefan Dombrowski <sdo451@gmail.com>
-Wombat <hpwombat@yahoo.com> brokendoor <brokendoor@brokendoor-desktop.(none)>
-<git@gumi.ca> <mekolat@users.noreply.github.com>
-<git@gumi.ca> <mekolat@gmail.com>
-gumi <git@gumi.ca> meko <git@gumi.ca>
-gumi <git@gumi.ca> mekolat <git@gumi.ca>
 Jesusaves <jesusalva@themanaworld.org> Jesusaves <cpntb1@ymail.com>
+Jesusaves <jesusalva@themanaworld.org> Jonatas L. Nogueira <cpntb1@ymail.com>
+Alige <aligetmw@hotmail.fr> Alige <gauvain.dauchy@free.fr>
+Alige <aligetmw@hotmail.fr> Alige <alige@debian>
+Reid <reidyaro@gmail.com> Reid Yaro <reidyaro@gmail.com>
+Reid <reidyaro@gmail.com> Reid <reid@Chlian>
+Reid <reidyaro@gmail.com> Reid Yaro <reid@Julie>
+Reid <reidyaro@gmail.com> Reid <reid@IdeaPad.(none)>
+gumi <git@gumi.ca> gumi <mekolat@users.noreply.github.com>
+Hal9000 <miglietta.francesco@gmail.com> Hal9OOO <miglietta.francesco@gmail.com>
+Hal9000 <miglietta.francesco@gmail.com> Hal9OOO (Francesco Miglietta) <miglietta.francesco@gmail.com>
+Hal9000 <miglietta.francesco@gmail.com> epoc <epoc@hal9000.(none)>
+Hal9000 <miglietta.francesco@gmail.com> <epoc@halthink.(none)>
+Micksha <ms-shaman@gmx.de> Micksha <Micksha@users.noreply.github.com>
+omatt <m.vuoso@laposte.net> omattornot <m.vuoso@laposte.net>
+omatt <m.vuoso@laposte.net> omatt <m.vuoso@laposte.net>
+gumi <git@gumi.ca> mekolat <mekolat@users.noreply.github.com>
 wushin <pasekei@gmail.com> Wushin <pasekei@gmail.com>
-The Kandiman <thekandiman@gmail.com> The Kandiman <kandiman@kandiman.(none)>
-The Kandiman <thekandiman@gmail.com> TheKandiman <thekandiman@gmail.com>
-Ben Longbons <b.r.longbons@gmail.com> o11c <b.r.longbons@gmail.com>
-jak1 <mike.wollmann@gmail.com> Mike <mikewollmann@gmail.com>
-Cassy1 <cassy.tmw@gmail.com> Cassy <cassy.tmw@gmail.com>
-David Gay <oddshocks@riseup.net> David Gay <oddshocks@gmail.com>
-WildX <wildx@evolonline.org> WildX001 <wildx@evolonline.org>
-Monwarez <monwarez@gmail.com> monwarez <monwarez@users.noreply.github.com>
+Monwarez <monwarez@gmail.com> Thibault Payet <monwarez@gmail.com>
+Monwarez <monwarez@gmail.com> User Monwarez <monwarez@gmail.com>
+Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <danilka.pro@gmail.com>
+Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <dan@archdemon.(none)>
+Vasily_Makarov <danilka.pro@gmail.com> dan <dan@dan-P41-ES3G.(none)>
+Vasily_Makarov <danilka.pro@gmail.com> Vasily <danilka.pro@gmail.com>
+Akko Teru <none@null.nil> Teru <9bi at [comc]ast dot net>
+jak1 <jak1@germantmw.de> jak1 <jak89_1@ftb4u.de>
+Kurt Kuschinski <hocus@themanaworld.org> Hocus <hocus@themanaworld.org>
+Kurt Kuschinski <hocus@themanaworld.org> Kurt Kuschinski <kurt.kuschinski@gmail.com>
+Saweres <onshine20@gmail.com> root <root@saweres.localdomain>
+Mikko <mikko.devel@gmail.com> Mikko <mikko@debian>
+Ledmitz <ledmitz@gmail.com> Ledmitz <smoothshifter@tuta.io>
+