[gentoo-commits] proj/kde:master commit in: /, Documentation/

[gentoo-commits] proj/kde:master commit in: /, Documentation/

[Johannes Huber]

commit:     dc37131a73c0292d1e936be46297e8b80999d8ec
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:54:54 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:54:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc37131a

Update CONTRIBUTORS

Punt 3 duplicates through mailmapping.

 .mailmap                   | 3 +++
 Documentation/CONTRIBUTORS | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1bc4b96..7d49c24 100644
--- a/.mailmap
+++ b/.mailmap
@@ -29,6 +29,7 @@ Manuel Rüger <mrueg@gentoo.org> <mrueg@rueg.eu>
 Marc Schiffbauer <mschiff@gentoo.org> <marc@schiffbauer.net>
 Marcus D. Hanwell <cryos@gentoo.org> <marcus@cryos.org>
 Markos Chandras <hwoarang@gentoo.org> <hwoarang@silverarrow.gr>
+Michael Palimaka <kensington@gentoo.org> <kensington@gentoo.org>
 Michael Palimaka <kensington@gentoo.org> <kensington@astralcloak.net>
 Patrick Lauer <patrick@gentoo.org> <bugs@dev.gentooexperimental.org>
 Patrick Lauer <patrick@gentoo.org> <patrick.lauer@star-group.net>
@@ -49,3 +50,5 @@ Unknown <root@localhost> <root@orion8.fritz.box>
 Unknown <root@localhost> <root@ronan-notebook.(none)>
 Unknown <root@localhost> <root@tux.(none)>
 Vadim A. Misbakh-Soloviev <mva@mva.name> <mva@mva.name>
+Vadim A. Misbakh-Soloviev <mva@mva.name> <git@mva.name>
+Vladimir Smirnov <civil.over@gmail.com> <civil.over@gmail.com>

diff --git a/Documentation/CONTRIBUTORS b/Documentation/CONTRIBUTORS
index 33b5848..f38a098 100644
--- a/Documentation/CONTRIBUTORS
+++ b/Documentation/CONTRIBUTORS
@@ -107,12 +107,9 @@ Torgny Nyblom <kde@nyblom.org>
 Unknown <root@localhost>
 Uwe L. Korn <uwelk@xhochy.com>
 Vadim A. Misbakh-Soloviev <mva@mva.name>
-Vadim A. Misbakh-Soloviov <git@mva.name>
-Vladimir Civil Smirnov <civil.over@gmail.com>
 Vladimir Smirnov <civil.over@gmail.com>
 William <William@undefined.re>
 frames <markkuehn@outlook.com>
-kensington <kensington@gentoo.org>
 krytzz <krytzz@soylent.eu>
 puchu <puchu@gmx.at>
 travlr <vel.accel@gmail.com>