Merge branch 'rf/maint-mailmap-off-by-one' into next
commit8c2214b2dc73bbc694f707d3ba6be14fb7ef3383
authorJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:44:27 +0000 (29 04:44 -0400)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:44:27 +0000 (29 04:44 -0400)
treed1cfe27e8e1684ba85f139501f479b68ac89125c
parentcdb4e8fb2e21dd94991e77fc5f4c2abb80403371
parent3174bc5ccfea34717a8dac2175c1951239a4985d
Merge branch 'rf/maint-mailmap-off-by-one' into next

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