Merge branch 'fixes'
commit82ed2bcd920d73d218e94c95178be6a61ec7ed54
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:39:11 +0000 (17 17:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Oct 2005 00:39:11 +0000 (17 17:39 -0700)
tree49569cd32d4917902874f92c1a577a981e56b21d
parent25785195eebcd700e854e1bcc89f8d5e711523e2
parentfd25c82a80533da035d42a5ac229ec5c5b332411
Merge branch 'fixes'