X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/ae0badf5bb791428423a98d4e4e2b8d297a5d4be..refs/heads/wip-bees:/.mailmap

diff --git a/.mailmap b/.mailmap
index 97018775f6..c18f2e08e3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -38,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> <kkebreau@posteo.net>
+Kei Kebreau <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>
@@ -47,21 +47,23 @@ 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@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>
+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>