From: Yann Dupont <yann@objoo.org>
Date: Mon, 8 Feb 2016 22:18:40 +0000 (+0100)
Subject: mailmap: Marcel Lauhoff affiliation
X-Git-Tag: v10.1.0~393^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=230bb728856bb3dabaad889bb3ed90b9de2dd747;p=ceph.git

mailmap: Marcel Lauhoff affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---

diff --git a/.mailmap b/.mailmap
index 97794e2378a..1cc5d59334d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -171,6 +171,8 @@ Lu Shi <shi.lu@h3c.com>
 Luo Kexue <luo.kexue@zte.com.cn> <scienceluo@qq.com>
 Ma Jianpeng <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
+Marcel Lauhoff <lauhoff@uni-mainz.de>
+Marcel Lauhoff <lauhoff@uni-mainz.de> <ml@irq0.org>
 Marco Garcês <marco.garces@bci.co.mz> <marco@garces.cc>
 Mark Nelson <mnelson@redhat.com> <mark.a.nelson@gmail.com>
 Matt Benjamin <matt@cohortfs.com> <matt@linuxbox.com>
diff --git a/.organizationmap b/.organizationmap
index 9d5e3eb3ba6..46cf47d3698 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -208,6 +208,7 @@ IO <contact@io.com> Joe Julian <jjulian@io.com>
 Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
 IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
 IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
+Johannes Gutenberg-Universität Mainz <contact@uni-mainz.de> Marcel Lauhoff <lauhoff@uni-mainz.de>
 Karlsruhe Institute of Technology <ceph@lists.kit.edu> Daniel J. Hofmann <daniel@trvx.org>
 Keeper Technology <contact@keepertech.com> Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
 Kylin Cloud <contact@kylin-cloud.com> Jie Wang <jie.wang@kylin-cloud.com>