mailmap: use Michael J Gruber's new address

mjg · gitster · commit 296ab786eed2 · 2017-03-24T12:30:27.000-07:00
Map both old addresses to the new, hopefully more permanent one.

Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Michael J Gruber &lt;git@grubix.eu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -151,7 +151,8 @@ Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
 Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
 Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
 Michael Coleman <tutufan@gmail.com>
-Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
+Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
 Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
 Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
 Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>

-Original file line number
+Diff line change
 Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
 Matthias Urlichs <[email protected]> <[email protected]>
 Michael Coleman <[email protected]>
 -Michael J Gruber <[email protected]> <[email protected]>
 +Michael J Gruber <[email protected]> <[email protected]>
 +Michael J Gruber <[email protected]> <[email protected]>
 Michael S. Tsirkin <[email protected]> <[email protected]>
 Michael S. Tsirkin <[email protected]> <[email protected]>
 Michael S. Tsirkin <[email protected]> <[email protected]>