From 4a78fd4617908546be15d2c101f5cab512c71f8e Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Tue, 20 Mar 2018 15:39:45 +0000
Subject: Correct name and Email for ng0.

* .mailmap: Correct name and Email for ng0.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm,
gnu/packages/cdrom.scm, gnu/packages/check.scm,
gnu/packages/cinnamon.scm, gnu/packages/compression.scm,
gnu/packages/crypto.scm, gnu/packages/databases.scm,
gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/emacs.scm, gnu/packages/enlightenment.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm,
gnu/packages/forth.scm, gnu/packages/fvwm.scm,
gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,
gnu/packages/guile.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm,
gnu/packages/image-viewers.scm, gnu/packages/image.scm,
gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm,
gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm,
gnu/packages/music.scm, gnu/packages/ncurses.scm,
gnu/packages/networking.scm, gnu/packages/nickle.scm,
gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-crypto.scm, gnu/packages/python-web.scm,
gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/ruby.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/serialization.scm,
gnu/packages/shells.scm, gnu/packages/ssh.scm,
gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm,
gnu/packages/tls.scm, gnu/packages/tor.scm,
gnu/packages/version-control.scm, gnu/packages/video.scm,
gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm,
gnu/packages/xfce.scm, gnu/packages/xml.scm,
gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm,
guix/licenses.scm: Likewise.

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
---
 .mailmap | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to '.mailmap')

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>
-- 
cgit v1.2.3