X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/f484a50d50c3778df76d63533634a71cd7301558..b828057ea4c096898da8c9810e7a6607359f2aa3:/.mailmap

diff --git a/.mailmap b/.mailmap
index 32c77307b8..146e65184a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com>
 Alexander I. Grafov <grafov@gmail.com>
 Alírio Eyng <alirioeyng@gmail.com>
+Amin Bandali <bandali@gnu.org> <mab@gnu.org>
 Amirouche Boubekki <amirouche@hypermove.net>
 Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
 Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
@@ -13,6 +14,7 @@ Andy Wingo <wingo@igalia.com> <wingo@pobox.com>
 Ben Woodcroft <donttrustben@gmail.com>
 Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
 Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
+Brett Gilio <brettg@gnu.org> <brettg@posteo.net>
 Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
 Daniel Pimentel <d4n1@d4n1.org> <d4n1@member.fsf.org>
@@ -23,9 +25,12 @@ David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
 David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com>
 Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
 Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
+Eric Bavier <bavier@member.fsf.org> <bavier@posteo.net>
 Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
 George Clemmer <myglc2@gmail.com>
+ison <ison@airmail.cc> <ison111@protonmail.com>
 Ivan Vilata i Balaguer <ivan@selidor.net>
+Jakob L. Kreuze <zerodaysfordays@sdf.org> <zerodaysfordays@sdf.lonestar.org>
 Jeff Mickey <j@codemac.net> <jm@igneous.io>
 John Darrington <jmd@gnu.org> <john@darrington.wattle.id.au>
 John J. Foerch <jjfoerch@earthlink.net>
@@ -33,7 +38,7 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
-Kei Kebreau <kei@openmailbox.org>
+Kei Kebreau <kei@openmailbox.org> <kkebreau@posteo.net>
 Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
 Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com>
@@ -41,15 +46,26 @@ Marius Bakke <mbakke@fastmail.com> <m.bakke@warwick.ac.uk>
 Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
 Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Mathieu Othacehe <m.othacehe@gmail.com>
+Mathieu Othacehe <mathieu.othacehe@parrot.com>
+Mathieu Othacehe <othacehe@gnu.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@no-reply.pragmatique.xyz>
-ng0 <ng0@no-reply.pragmatique.xyz> <ng0@pragmatique.xyz>
-ng0 <ng0@no-reply.pragmatique.xyz> <contact.ng0@cryptolab.net>
-ng0 <ng0@no-reply.pragmatique.xyz> <ng0@we.make.ritual.n0.is>
-ng0 <ng0@no-reply.pragmatique.xyz> <ngillmann@runbox.com>
-ng0 <ng0@no-reply.pragmatique.xyz> <niasterisk@grrlz.net>
-ng0 <ng0@no-reply.pragmatique.xyz> <ng@niasterisk.space>
-ng0 <ng0@no-reply.pragmatique.xyz> <ng0@libertad.pw>
+nikita <nikita@n0.is>
+nikita <nikita@n0.is> ng0 <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <gillmann@infotropique.org>
+nikita <nikita@n0.is> ng0 <ng0@crash.cx>
+nikita <nikita@n0.is> <ng0@infotropique.org>
+nikita <nikita@n0.is> <ng0@no-reply.infotropique.org>
+nikita <nikita@n0.is> <ng0@no-reply.pragmatique.xyz>
+nikita <nikita@n0.is> <ng0@pragmatique.xyz>
+nikita <nikita@n0.is> <contact.ng0@cryptolab.net>
+nikita <nikita@n0.is> <ng0@we.make.ritual.n0.is>
+nikita <nikita@n0.is> <ngillmann@runbox.com>
+nikita <nikita@n0.is> <niasterisk@grrlz.net>
+nikita <nikita@n0.is> <ng@niasterisk.space>
+nikita <nikita@n0.is> <ng0@libertad.pw>
+Pierre Neidhardt <mail@ambrevar.xyz>
+Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl>
 Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email>
@@ -63,6 +79,7 @@ Sou Bunnbu (宋文武) <iyzsong@gmail.com>
 Sou Bunnbu (宋文武) <iyzsong@gmail.com> <iyzsong@member.fsf.org>
 Stefan Reichör <stefan@xsteve.at>
 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+Theodoros Foradis <theodoros.for@openmailbox.org> <theodoros@foradis.org>
 Thomas Danckaert <thomas.danckaert@gmail.com> <post@thomasdanckaert.be>
 Tobias Geerinckx-Rice <me@tobias.gr> <tobias.geerinckx.rice@gmail.com>
 Tomáš Čech <sleep_walker@gnu.org> <sleep_walker@suse.cz>