Merge branch 'ds/mailmap'
Update mailmap entries.* ds/mailmap: mailmap: change primary address for Derrick Stolee
Junio C Hamano 4 years ago 008adee2 88135965