Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Dec 2005 07:48:31 +0000 (23:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Dec 2005 07:48:31 +0000 (23:48 -0800)
commitebc12ce5bfcf6401c8fcc7e4935bc50142a65db4
tree4bd8cf5c083d53b8213f6cdb1fa7312c09030e2b
parent6d016c9c7f21a97249c4571e8d7265da1fd2f083
parent7246ed438c541650c2cd50e4e98b43226f60da0c
Merge branch 'fixes'