Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:19:47 +0000 (23:19 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 21 Oct 2005 06:19:47 +0000 (23:19 -0700)
commitf6804930cae3ccf48b200264bdb7a25b4382d454
treea161b324fef1613f1a0abcae3172c4b83b3a25a7
parent147a1ab03599c21c9e5972739c460fd2635c0c02
parenta935c3972749095e7ea6c341e539a94de705ecfd
Merge branch 'fixes'
daemon.c