summary refs log tree commit diff
path: root/.mailmap
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-03-20 14:22:06 -0400
committerMark H Weaver <mhw@netris.org>2018-03-20 14:22:06 -0400
commitac21be848ac420d2106d4441e9e48ea6a60c5c8c (patch)
treebbd383d300a2142389dfcd90263d8f99adbd0d7a /.mailmap
parentd3da21d222665de607f65d475dff1d2d55247753 (diff)
parent4a78fd4617908546be15d2c101f5cab512c71f8e (diff)
downloadguix-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap25
1 files changed, 13 insertions, 12 deletions
diff --git a/.mailmap b/.mailmap
index 84a1c469c3..4f672f3278 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,18 +42,19 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
 Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Mathieu Othacehe <m.othacehe@gmail.com>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@crash.cx>
-ng0 <ng0@crash.cx> ng0 <ng0@n0.is>
-ng0 <ng0@crash.cx> <ng0@infotropique.org>
-ng0 <ng0@crash.cx> <ng0@no-reply.infotropique.org>
-ng0 <ng0@crash.cx> <ng0@no-reply.pragmatique.xyz>
-ng0 <ng0@crash.cx> <ng0@pragmatique.xyz>
-ng0 <ng0@crash.cx> <contact.ng0@cryptolab.net>
-ng0 <ng0@crash.cx> <ng0@we.make.ritual.n0.is>
-ng0 <ng0@crash.cx> <ngillmann@runbox.com>
-ng0 <ng0@crash.cx> <niasterisk@grrlz.net>
-ng0 <ng0@crash.cx> <ng@niasterisk.space>
-ng0 <ng0@crash.cx> <ng0@libertad.pw>
+Nils Gillmann <ng0@n0.is> ng0 <ng0@n0.is>
+Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx>
+Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx>
+Nils Gillmann <ng0@n0.is> <ng0@infotropique.org>
+Nils Gillmann <ng0@n0.is> <ng0@no-reply.infotropique.org>
+Nils Gillmann <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
+Nils Gillmann <ng0@n0.is> <ng0@pragmatique.xyz>
+Nils Gillmann <ng0@n0.is> <contact.ng0@cryptolab.net>
+Nils Gillmann <ng0@n0.is> <ng0@we.make.ritual.n0.is>
+Nils Gillmann <ng0@n0.is> <ngillmann@runbox.com>
+Nils Gillmann <ng0@n0.is> <niasterisk@grrlz.net>
+Nils Gillmann <ng0@n0.is> <ng@niasterisk.space>
+Nils Gillmann <ng0@n0.is> <ng0@libertad.pw>
 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>