Rollup merge of #31750 - GuillaumeGomez:mailmap, r=nikomatsakis

steveklabnik · steveklabnik · commit 575c85abfd29 · 2016-02-19T14:23:28.000-05:00
It's notably for #31707
diff --git a/.mailmap b/.mailmap
@@ -82,7 +82,7 @@ Gareth Daniel Smith <garethdanielsmith@gmail.com> Gareth Smith <garethdanielsmit
 Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
 Graham Fawcett <graham.fawcett@gmail.com> Graham Fawcett <fawcett@uwindsor.ca>
 Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
-Guillaume Gomez <guillaume1.gomez@gmail.com>
+Guillaume Gomez <guillaume1.gomez@gmail.com> Guillaume Gomez <ggomez@ggo.ifr.lan>
 Heather <heather@cynede.net> <Cynede@Gentoo.org>
 Heather <heather@cynede.net> <Heather@cynede.net>
 Herman J. Radtke III <herman@hermanradtke.com> Herman J. Radtke III <hermanradtke@gmail.com>

-Original file line number
+Diff line change
 Georges Dubus <[email protected]> <[email protected]>
 Graham Fawcett <[email protected]> Graham Fawcett <[email protected]>
 Graydon Hoare <[email protected]> Graydon Hoare <[email protected]>
 -Guillaume Gomez <[email protected]>
 +Guillaume Gomez <[email protected]> Guillaume Gomez <[email protected]>
 Heather <[email protected]> <[email protected]>
 Heather <[email protected]> <[email protected]>
 Herman J. Radtke III <[email protected]> Herman J. Radtke III <[email protected]>