[gnunet] branch master updated: mailmap, authors: final sync of my address and name with changes in NetBSD and GNUnet members.

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 87481d240 mailmap, authors: final sync of my address and name with 
changes in NetBSD and GNUnet members.
87481d240 is described below

commit 87481d240d6e44a324ffb5c1a695addd5898ae21
Author: nikita <address@hidden>
AuthorDate: Sun Apr 19 14:07:21 2020 +0200

    mailmap, authors: final sync of my address and name with changes in NetBSD 
and GNUnet members.
---
 .mailmap | 17 +++++++++--------
 AUTHORS  |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index e15a72268..2ca867b4e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,14 +14,15 @@ Jeffrey Burdges <address@hidden>
 Martin Schanzenbach <address@hidden> Schanzenbach, Martin <address@hidden>
 Martin Schanzenbach <address@hidden> Schanzenbach, Martin <address@hidden>
 Martin Schanzenbach <address@hidden> Martin Schanzenbach <address@hidden>
-nikita <address@hidden> address@hidden <address@hidden>
-nikita <address@hidden> ng0 <address@hidden>
-nikita <address@hidden>
-nikita <address@hidden> ng0 <address@hidden>
-nikita <address@hidden> ng0 <address@hidden>
-nikita <address@hidden>  N. 'ng0' Gillmann <address@hidden>
-nikita <address@hidden> ng0 <address@hidden>
-nikita <address@hidden>  Nils Gillmann <address@hidden>
+nikita <address@hidden>
+nikita <address@hidden> nikita <address@hidden>
+nikita <address@hidden> address@hidden <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden>  N. 'ng0' Gillmann <address@hidden>
+nikita <address@hidden> ng0 <address@hidden>
+nikita <address@hidden>  Nils Gillmann <address@hidden>
 t3sserakt <address@hidden>
 t3sserakt <address@hidden> <address@hidden>
 tg(x) <*@tg-x.net>
diff --git a/AUTHORS b/AUTHORS
index d44dc3920..061d51379 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,7 +70,7 @@ Marko Räihä
 Michael John Wensley <address@hidden>
 Milan Bouchet-Valat <address@hidden>
 Nathan Evans <address@hidden>
-Nils Gillmann <address@hidden> [ Documentation export to Texinfo ]
+nikita <address@hidden> [ Documentation export to Texinfo ]
 Paul Ruth <address@hidden>
 Philipp Tölke <address@hidden>, <address@hidden>
 Renaldo Ferreira <address@hidden>
@@ -124,8 +124,8 @@ Nix:              viric, rahul
 OpenWrt/LEDE:     Daniel Golle <address@hidden>
 macOS:            Jussi Eloranta <address@hidden>
 Gentoo:                  Carlo von lynX <psyc://loupsycedyglgamf.onion/~lynX>
-                  N. Gillmann <address@hidden>
-NetBSD pkgsrc:    N. Gillmann <address@hidden>
+                  nikita <address@hidden>
+NetBSD pkgsrc:    nikita <address@hidden>
 
 If you have contributed and are not listed here, please
 notify one of the maintainers in order to be added.

-- 
To stop receiving notification emails like this one, please contact
address@hidden.