Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:21:50 +0000 (23:21 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:21:50 +0000 (23:21 -0700)
commit4ae22d96fe9248dac4f26b1fc91154ba5e879799
tree8db8bfa6d55d8120ca96f8311172830e814459c4
parent54e31a205c63d8bc8cd3dcf6956f81d3b968ea48
parenta935c3972749095e7ea6c341e539a94de705ecfd
Merge branch 'fixes'
daemon.c