Merge branch 'jk/format-person-part-buffer-limit' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 19:59:58 +0000 (12:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 19:59:58 +0000 (12:59 -0700)
By Jeff King
* jk/format-person-part-buffer-limit:
  pretty: avoid buffer overflow in format_person_part

1  2 
pretty.c

diff --cc pretty.c
Simple merge