Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sat, 8 Oct 2005 00:06:21 +0000 (17:06 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 8 Oct 2005 00:06:21 +0000 (17:06 -0700)
commit0d0b7c237af0846123bef73879d65a3e78a56461
tree274542bcbc891cca353c2728ac4075df3d1d2c0d
parentd1c5f2a42d7b5c0e3d3862212dea1f09809c4963
parent33bb218e9d7299f6ed06177c65d357ec81954ca9
Merge branch 'fixes'