[systemd-devel] [PATCH 2/2] Update .mailmap file

[Stefan Beller]

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
---
 .mailmap | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 2aa7cb1..bda835c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@ Kay Sievers <kay at vrfy.org> <kay.sievers at vrfy.org>
 Kay Sievers <kay at vrfy.org> <kay.sievers at suse.de>
 Kay Sievers <kay at vrfy.org> <kay at pim.off.vrfy.org>
 Kay Sievers <kay at vrfy.org> <kay at pim>
+Kay Sievers <kay at vrfy.org> <kay at yik.fritz.box>
 Greg KH <greg at kroah.com>
 Greg KH <greg at kroah.com> <greg at kroah.com>
 Greg KH <greg at kroah.com> <greg at press.(none)>
@@ -36,7 +37,7 @@ Michal Soltys <soltys at ziu.info> <nozo at ziu.info>
 Piter PUNK <piterpunk at slackware.com> <piterpk at terra.com.br>
 Richard Hughes <richard at hughsie.com> <hughsient at gmail.com>
 Robby Workman <rw at rlworkman.net> <rworkman at slackware.com>
-Shawn Landden <shawnlandden at gmail.com>
+Shawn Landden <shawnlandden at gmail.com> <shawn at churchofgit.com>
 Simon Peeters <peeters.simon at gmail.com>
 Tobias Klauser <tklauser at distanz.ch> <tklauser at nuerscht.ch>
 Miklos Vajna <vmiklos at frugalware.org> <vmiklos at gmail.com>
@@ -50,6 +51,7 @@ Ted Ts'o <tytso at mit.edu>
 Tobias Klauser <tklauser at access.unizh.ch>
 Tobias Klauser <tklauser at access.unizh.ch> <tklauser at access.unizh.chbk>
 Tobias Klauser <tklauser at access.unizh.ch> <klauser at access.unizh.ch>
+Tobias Klauser <tklauser at access.unizh.ch> <tklauser at distanz.ch>
 Patrick Mansfield <patmans at us.ibm.com>
 Christophe Varoqui <christophe.varoqui at free.fr>
 Daniel Stekloff <dsteklof at us.ibm.com>
-- 
1.8.5.2.229.g4448466