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)
commit92ddfaadc226d4b04681523a3a5649b65b06ca5f
tree4319d0b2fc9c057768adaf72281b6bce21d1bc8d
parent63cdf160f335758e80e898cda6d6cdaca72dc745
parentc9b4e9e5b6587ea433cd93c3c99f8720ff2fdad2
Merge branch 'jk/format-person-part-buffer-limit' into maint

By Jeff King
* jk/format-person-part-buffer-limit:
  pretty: avoid buffer overflow in format_person_part
pretty.c