Merge branch 'sb/mailmap-updates'

diff --git a/.mailmap b/.mailmap
index f7cc21ebc1e2ccc9fe29d6dce09f3327ab435d33..840abf7cba28980495c7cf408540684be10e7150 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -172,7 +172,7 @@ Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
-René Scharfe <rene.scharfe@lsrfire.ath.cx>
+René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>