summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2014-01-03 20:33:21 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-01-05 00:43:22 -0500
commit9dddaedfcc70c6dc37ba6a48d1d8e27e12c0cb2e (patch)
tree55f29e1af0097227bb0ea66c09effc819ebfb39a
parent7bb01eff62aa7b612e33fe0e512a4d97862050c4 (diff)
Update .mailmap file
This commit updates email addresses of people, who are already in the .mailmap file, so I'd assume they have sorted out their viewpoint on privacy within the .mailmap file. The entries for this commit have been produced using: # Finding out duplicates by comparing email addresses: git shortlog -sne |awk '{ print $NF }' |sort |uniq -d # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d
-rw-r--r--.mailmap4
1 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ddaf4d5708..e1cdf0616f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@ Kay Sievers <kay@vrfy.org> <kay.sievers@vrfy.org>
Kay Sievers <kay@vrfy.org> <kay.sievers@suse.de>
Kay Sievers <kay@vrfy.org> <kay@pim.off.vrfy.org>
Kay Sievers <kay@vrfy.org> <kay@pim>
+Kay Sievers <kay@vrfy.org> <kay@yik.fritz.box>
Greg KH <greg@kroah.com>
Greg KH <greg@kroah.com> <greg@kroah.com>
Greg KH <greg@kroah.com> <greg@press.(none)>
@@ -36,7 +37,7 @@ Michal Soltys <soltys@ziu.info> <nozo@ziu.info>
Piter PUNK <piterpunk@slackware.com> <piterpk@terra.com.br>
Richard Hughes <richard@hughsie.com> <hughsient@gmail.com>
Robby Workman <rw@rlworkman.net> <rworkman@slackware.com>
-Shawn Landden <shawnlandden@gmail.com>
+Shawn Landden <shawnlandden@gmail.com> <shawn@churchofgit.com>
Simon Peeters <peeters.simon@gmail.com>
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
Miklos Vajna <vmiklos@frugalware.org> <vmiklos@gmail.com>
@@ -50,6 +51,7 @@ Ted Ts'o <tytso@mit.edu>
Tobias Klauser <tklauser@access.unizh.ch>
Tobias Klauser <tklauser@access.unizh.ch> <tklauser@access.unizh.chbk>
Tobias Klauser <tklauser@access.unizh.ch> <klauser@access.unizh.ch>
+Tobias Klauser <tklauser@access.unizh.ch> <tklauser@distanz.ch>
Patrick Mansfield <patmans@us.ibm.com>
Christophe Varoqui <christophe.varoqui@free.fr>
Daniel Stekloff <dsteklof@us.ibm.com>