X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/6f7bcaad6aabd1b0780e4d711c94e6ab56d4e723..7a241c63503c81a0f9ed284c7cc66da058aa00cf:/.mailmap

diff --git a/.mailmap b/.mailmap
index a6687ee447..daab7c91a1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
 # This list is used to avoid multiple name/email instances of the same
 # contributors reported by "git log" and "git shortlog" commands.
 
+Adriano Peluso <catonano@gmail.com>
 Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com>
 Alexander I. Grafov <grafov@gmail.com>
@@ -12,6 +13,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>
@@ -22,8 +24,10 @@ 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>
 Jeff Mickey <j@codemac.net> <jm@igneous.io>
 John Darrington <jmd@gnu.org> <john@darrington.wattle.id.au>
@@ -32,19 +36,32 @@ 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>
 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>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@libertad.pw> <ng0@we.make.ritual.n0.is>
-ng0 <ng0@libertad.pw> <ngillmann@runbox.com>
-ng0 <ng0@libertad.pw> <niasterisk@grrlz.net>
-ng0 <ng0@libertad.pw> <ng@niasterisk.space>
-ng0 <ng0@libertad.pw>
+ng0 <ng0@n0.is> Nils Gillmann <ng0@n0.is>
+ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
+ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
+ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
+ng0 <ng0@n0.is> <ng0@infotropique.org>
+ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org>
+ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
+ng0 <ng0@n0.is> <ng0@pragmatique.xyz>
+ng0 <ng0@n0.is> <contact.ng0@cryptolab.net>
+ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is>
+ng0 <ng0@n0.is> <ngillmann@runbox.com>
+ng0 <ng0@n0.is> <niasterisk@grrlz.net>
+ng0 <ng0@n0.is> <ng@niasterisk.space>
+ng0 <ng0@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>
@@ -58,6 +75,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>