From: Yann Dupont <yann@objoo.org>
Date: Tue, 17 Mar 2015 18:02:20 +0000 (+0000)
Subject: mailmap: Thomas Johnson affiliation
X-Git-Tag: v9.0.0~109^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9ccd550daacff659edaae73de456331f3d479c2;p=ceph.git

mailmap: Thomas Johnson affiliation

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

diff --git a/.mailmap b/.mailmap
index 5a3cbee7e8f1..fc0319eec627 100644
--- a/.mailmap
+++ b/.mailmap
@@ -190,6 +190,7 @@ Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@tamil-VirtualBox.(none)
 Tamil Muthamizhan <tamil.muthamizhan@inktank.com> <tamil@ubuntu.(none)>
 Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
 Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
+Thomas Johnson <NTmatter@gmail.com> <thomas.johnson@180amsterdam.com>
 Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
 Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
 Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
diff --git a/.organizationmap b/.organizationmap
index f777322d6586..6bcd964837f9 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -293,6 +293,7 @@ Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
 Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
+Unaffiliated <no@organization.net> Thomas Johnson <ntmatter@gmail.com>
 Unaffiliated <no@organization.net> Vicente Cheng <freeze.bilsted@gmail.com>
 Unaffiliated <no@organization.net> Viktor Suprun <popsul1993@gmail.com>
 Unaffiliated <no@organization.net> Volker Voigt <volker.voigt@1und1.de>