From: Loic Dachary <loic@dachary.org>
Date: Mon, 27 Jan 2014 05:06:34 +0000 (+0100)
Subject: mailmap: Christian Marie affiliation
X-Git-Tag: v0.78~243^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a28f1fa24345f7b52f2ba5ecb16423039adf1c42;p=ceph.git

mailmap: Christian Marie affiliation

and name normalization

Reviewed-by: Christian Marie <pingu@anchor.net.au>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 92607347a973..18ab0aafc710 100644
--- a/.mailmap
+++ b/.mailmap
@@ -113,3 +113,4 @@ Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Netwo
 Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
 Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
+Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
diff --git a/.organizationmap b/.organizationmap
index 85b00ba44620..fa09e7ce284d 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -123,6 +123,7 @@ Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@un
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
 Choopa, LLC <contact@choopa.com> Adam Twardowski <adam.twardowski@gmail.com>
 CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
+Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \