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 92607347a973062475370b7c6e811b640a1b0bf3..18ab0aafc710db0b0f9b9077fdc4a8d2172486bd 100644 (file)
--- 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 85b00ba446201b54fb162c5ea263e2a15869bf9b..fa09e7ce284d430049f06770bf28c783e88d62e0 100644 (file)
--- 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>' | \