Merge branch 'maint-1.6.1' into maint
commitf7446fc6bbe9c25f7064ba76b2db4dd67691f7d0
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:20:58 +0000 (17 21:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:20:58 +0000 (17 21:20 -0700)
tree68e605b2bd790aedf5366ee7b93697e5cdc0238d
parentae57ec223b37556224010db93e71e3ceb2cf257b
parent0fa0514b9172186d018c884da296ac6705c3e07c
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  Fix buffer overflow in config parser
config.c