[GNUnet-SVN] [gnunet] branch master updated: introduce .mailmap

[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 808aaae0c introduce .mailmap
     new df31a65d9 Merge branch 'master' of gnunet.org:gnunet
808aaae0c is described below

commit 808aaae0cc2ed4f41ab21563c33759f563bcd5cc
Author: ng0 <address@hidden>
AuthorDate: Thu Jan 4 23:19:58 2018 +0000

    introduce .mailmap
    
    Some of us use(d) various names or emails interchangeable over the 
years/currently.
    git integrated tools can help to count how many people contributed to a 
release,
    the use of mailmap 
(https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html)
    helps to map authors+email.
    
    If I used the wrong prefered primary name+email, change it yourself.
    Only it yourself in this file if you used more than one name/email.
---
 .mailmap | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..4db81bf05
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,26 @@
+Bart Polot <address@hidden>
+Bart Polot <address@hidden> <address@hidden>
+Bart Polot <address@hidden> <address@hidden>
+Carlo von lynX <address@hidden>
+Carlo von lynX <address@hidden> psyc://loupsycedyglgamf.onion/~lynX 
<BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>
+Carlo von lynX <address@hidden> psyc://loupsycedyglgamf.onion/~lynX 
<ircs://psyced.org/youbroketheinternet>
+David Barksdale <address@hidden> <address@hidden>
+David Barksdale <address@hidden>
+David Barksdale <address@hidden> <address@hidden>
+Jeffrey Burdges <address@hidden> Jeff Burdges <address@hidden>
+Jeffrey Burdges <address@hidden>
+Руслан Ижбулатов <address@hidden>
+Руслан Ижбулатов <address@hidden> LRN <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>
+ng0 <address@hidden>
+ng0 <address@hidden> <address@hidden>
+ng0 <address@hidden> <address@hidden>
+ng0 <address@hidden> N. 'ng0' Gillmann <address@hidden>
+ng0 <address@hidden> <address@hidden>
+t3sserakt <address@hidden>
+t3sserakt <address@hidden> <address@hidden>
+tg(x) <address@hidden>
+tg(x) <address@hidden> Gabor X Toth <address@hidden>
+

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