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 <k...@vrfy.org> <kay.siev...@vrfy.org>
 Kay Sievers <k...@vrfy.org> <kay.siev...@suse.de>
 Kay Sievers <k...@vrfy.org> <k...@pim.off.vrfy.org>
 Kay Sievers <k...@vrfy.org> <kay@pim>
+Kay Sievers <k...@vrfy.org> <k...@yik.fritz.box>
 Greg KH <g...@kroah.com>
 Greg KH <g...@kroah.com> <g...@kroah.com>
 Greg KH <g...@kroah.com> <greg@press.(none)>
@@ -36,7 +37,7 @@ Michal Soltys <sol...@ziu.info> <n...@ziu.info>
 Piter PUNK <piterp...@slackware.com> <pite...@terra.com.br>
 Richard Hughes <rich...@hughsie.com> <hughsi...@gmail.com>
 Robby Workman <r...@rlworkman.net> <rwork...@slackware.com>
-Shawn Landden <shawnland...@gmail.com>
+Shawn Landden <shawnland...@gmail.com> <sh...@churchofgit.com>
 Simon Peeters <peeters.si...@gmail.com>
 Tobias Klauser <tklau...@distanz.ch> <tklau...@nuerscht.ch>
 Miklos Vajna <vmik...@frugalware.org> <vmik...@gmail.com>
@@ -50,6 +51,7 @@ Ted Ts'o <ty...@mit.edu>
 Tobias Klauser <tklau...@access.unizh.ch>
 Tobias Klauser <tklau...@access.unizh.ch> <tklau...@access.unizh.chbk>
 Tobias Klauser <tklau...@access.unizh.ch> <klau...@access.unizh.ch>
+Tobias Klauser <tklau...@access.unizh.ch> <tklau...@distanz.ch>
 Patrick Mansfield <patm...@us.ibm.com>
 Christophe Varoqui <christophe.varo...@free.fr>
 Daniel Stekloff <dstek...@us.ibm.com>
-- 
1.8.5.2.229.g4448466

_______________________________________________
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Reply via email to