From 2cf3a3d1c5eebd03e5ed17d3b97905a0479f8fd3 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Fri, 28 Apr 2017 21:06:52 +0200
Subject: [PATCH] Update mailmap file

---
 .mailmap | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index a2eb9de5d6..247ad33c0a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,17 +9,21 @@ Hubert Talbot							<hubert.talbot64@gmail.com>
 Ilya Bizyaev							<bizyaev.game@yandex.ru>
 Jouk Jansen							<joukj@hrem.nano.tudelft.nl>
 Julian Smart							<julian@anthemion.co.uk>
+Jevgenijs Protopopovs						<jprotopopov1122@gmail.com>
 Kinaou Hervé							<kinaouherve@gmail.com>
 Lynn C. Rees							<lcrees@gmail.com>
 Maarten Bent							<MaartenBent@users.noreply.github.com>
 Manuel Martin							<mmartin@ceyd.es>
-Martin Ettl							<ettl.martin78@gmail.com>
+Martin Ettl		<ettl.martin78@googlemail.com>		<ettl.martin78@gmail.com>
+Martin Ettl							<ettl.martin78@googlemail.com>
 Micha Ahrweiler							<mbaschnitzi@users.noreply.github.com>
+ousnius			<ousnius@users.noreply.github.com>	<denis41@hotmail.de>
 Paul Cornett		<paulcor@bullseye.com>			<paulcor@users.noreply.github.com>
 Paul Kulchenko		<paul@kulchenko.com>			<paulclinger@gmail.com>
 Richard Fath							<richard.fath@t-online.de>
 Steve Browne		<swbrowne@gmail.com>			<sbrowne@unknown>
 Tim Kosse		<tim.kosse@gmx.de>			<tim.kosse@filezilla-project.org>
+Tim Stahlhut		<stahta01@users.sourceforge.net>	<stahta01@users.noreply.github.com>
 Tobias Taschner		<ttaschner@protect-software.com>	<TcT2k@users.noreply.github.com>
 			<ttaschner@protect-software.com>	<github@tc84.de>
 Václav Slavík		<vaclav@slavik.io>			<vslavik@fastmail.fm>