Merge branch 'maint'
commit7cb97da17da080b88ceb0417108e6a3cb6c6299f
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 09:16:44 +0000 (17 01:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 09:16:44 +0000 (17 01:16 -0800)
treef3940fe7061ce10d3f91d082bffc290c10e3491b
parentf8732c5596eb58d0daafdd61355e59831a95ae2e
parente5fc9a0aea2c3c49829b5cdf499339e5c759706b
Merge branch 'maint'

* maint:
  GIT 1.5.4.2