Merge branch 'rf/maint-mailmap-off-by-one' into maint
commite87719fc944f8a9961ba9c371c485efe54dd08b5
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:14:28 +0000 (20 10:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:14:29 +0000 (20 10:14 -0800)
tree9dea82cfcd86dfa5e761fb7f065af088e53b3dac
parent35cae74c4d38b79ca80f6e62761f64fa67e8e609
parent3174bc5ccfea34717a8dac2175c1951239a4985d
Merge branch 'rf/maint-mailmap-off-by-one' into maint

* rf/maint-mailmap-off-by-one:
  mailmap: avoid out-of-bounds memory access