Merge fixes up to GIT 1.1.4
authorJunio C Hamano <junkio@cox.net>
Fri, 20 Jan 2006 03:57:56 +0000 (19:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 20 Jan 2006 03:57:56 +0000 (19:57 -0800)
commit949964c4af740015c53cb7630fea8795e0f710a0
tree23b12b461044ba8d4f10d8dd6a6f53f8b9bc237f
parent5c7d3c9507f74a6f5c3f44915c42ee9ec22c1211
parentc4e804bbf0c16aa0c2234ea733fba73de28bddaa
Merge fixes up to GIT 1.1.4