From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 20 Jun 2016 09:09:39 +0000 (+0200)
Subject: .mailmap update - Martin mag multiple Mailadressen.
X-Git-Tag: release-3.4.1~29
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=33837b1426606412622c7a56689f5a5ffbfcf717;p=kivitendo-erp.git

.mailmap update - Martin mag multiple Mailadressen.
---

diff --git a/.mailmap b/.mailmap
index c306c2847..90d76499c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,6 +14,8 @@ Jan Büren <jan@kivitendo-premium.de> <jan@richardson-bueren.de>
 Jan Büren <jan@kivitendo-premium.de> <jan@weitan.org>
 Joachim Zach <joachim@lx-office-hosting.de> <info@ceos-gmbh.de>
 Martin Helmling <martin.helmling@octosoft.eu> <MartinHelmling@octo-soft.de>
+Martin Helmling <martin.helmling@octosoft.eu> <mh@waldpark.octosoft.eu>
+Martin Helmling <martin.helmling@octosoft.eu> Martin Helmling martin.helmling@octosoft.eu
 Martin Helmling <martin.helmling@octosoft.eu> Martin Helmling mh@waldpark.octosoft.eu <martin.helmling@octosoft.eu>
 Moritz Bunkus <m.bunkus@linet-services.de> <moritz@bunkus.org>
 Niclas Zimmermann <niclas@kivitendo-premium.de> <niclas@lx-office-hosting.de>