diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-05 10:11:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 10:11:14 -0700 |
| commit | 4fcd30df85a50ad244424e220a0e032cdd544266 (patch) | |
| tree | 4e738ea2a1d1e7ee09fcecba7721c23da80dd9f5 | |
| parent | d6f3ab573ee48927c7ef272e56b043758feb0a81 (diff) | |
| parent | 487e5707852cca03f924ea4dcfbcad1030db58d8 (diff) | |
| download | git-4fcd30df85a50ad244424e220a0e032cdd544266.tar.gz | |
Merge branch 'sb/mailmap-updates'
* sb/mailmap-updates:
.mailmap: Multiple addresses of Michael S. Tsirkin
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -130,6 +130,9 @@ 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 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> Michael W. Olson <mwolson@gnu.org> Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU> Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu> |