Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin

Junio C Hamano committed Aug 5, 2013 at 10:11 UTC 4fcd30df85a50ad244424e220a0e032cdd544266

No changes.