Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons

Junio C Hamano committed Jul 30, 2013 at 09:16 UTC 3717c73f6205eada7701d254e5c6aff156a14224

No changes.