From: Junio C Hamano Date: Mon, 5 Aug 2013 17:11:14 +0000 (-0700) Subject: Merge branch 'sb/mailmap-updates' X-Git-Tag: v1.8.4-rc2~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4fcd30df85a50ad244424e220a0e032cdd544266?ds=inline;hp=-c Merge branch 'sb/mailmap-updates' * sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin --- 4fcd30df85a50ad244424e220a0e032cdd544266 diff --combined .mailmap index 57551b05d6,ee2f2dca31..dfa2e65348 --- a/.mailmap +++ b/.mailmap @@@ -130,6 -130,9 +130,9 @@@ Matthias Urlichs Matthias Urlichs Michael Coleman Michael J Gruber + Michael S. Tsirkin + Michael S. Tsirkin + Michael S. Tsirkin Michael W. Olson Michael Witten Michael Witten @@@ -166,7 -169,7 +169,7 @@@ Philipp A. Hartmann Ralf Thielow Ramsay Allan Jones -René Scharfe +René Scharfe Robert Fitzsimons Robert Shearman Robert Zeh