Merge branch 'rs/mailmap-himself'
commitcbc7fdf81dee94333f11e775ab47b7e7b35ea81c
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:58 +0000 (18 12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jul 2013 19:59:58 +0000 (18 12:59 -0700)
treed06d7511171e1753cc612885a187e0303cf78a4e
parentec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029
parent76053e77efb3097cfb4cdaf2eb76ce4ee65ff58b
Merge branch 'rs/mailmap-himself'

* rs/mailmap-himself:
  .mailmap: RenĂ© Scharfe has a new email address
.mailmap