Merge fixes up to GIT 1.1.1
authorJunio C Hamano <junkio@cox.net>
Wed, 11 Jan 2006 00:29:17 +0000 (16:29 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 11 Jan 2006 00:29:17 +0000 (16:29 -0800)
commitcfa6d70bd4a24fd9915880112cf1af41a616579c
treeb45c0333802284fe87a77c5d2baaa2bd7a6b047b
parentc2bdd6afe29589980e66855d574907240cb9c62a
parent78ff5cf6b5595fa3ae291fa9ee3595b7c7cc624a
Merge fixes up to GIT 1.1.1