Merge branch 'maint-1.6.0' into maint-1.6.1
commit0fa0514b9172186d018c884da296ac6705c3e07c
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:06:11 +0000 (17 21:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 04:06:11 +0000 (17 21:06 -0700)
treef9a5ceda42948715bd283727e1b93fa13548163b
parentbc69776aa12c68958e381e8c24e8faa172dde2d8
parente0b3cc0dffbc965ffa33155cbdcf8d44716c134c
Merge branch 'maint-1.6.0' into maint-1.6.1

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