Merge branch 'ew/normal-to-e'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 May 2016 20:40:29 +0000 (13:40 -0700)
commit231cc9489915b1e09c44350a0a7e58fb73ffdf34
tree59a3144ea5fb362fadc9f10272505dcaeb7f4853
parent7a959426b61e673032861f7a89ce9c5254bd5830
parentfa7224589fb719503d883c43e87513ab514b4a15
Merge branch 'ew/normal-to-e'

* ew/normal-to-e:
  .mailmap: update to my shorter email address