Merge branch 'ew/normal-to-e' into HEAD
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:12 +0000 (14:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 May 2016 21:40:12 +0000 (14:40 -0700)
commit977cb3e2c5692234159b7f879eaccef946a0f9cb
tree0ed81535f1d9425f04abcf3bc979d4691eeaad48
parent258b862edbacc28bc0ed7543e60ae327ec08299b
parentfa7224589fb719503d883c43e87513ab514b4a15
Merge branch 'ew/normal-to-e' into HEAD

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