Merge branch 'sb/daemon'
authorJunio C Hamano <gitster@pobox.com>
Sat, 30 Aug 2008 15:17:15 +0000 (08:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 30 Aug 2008 15:17:15 +0000 (08:17 -0700)
* sb/daemon:
daemon.c: minor style fixup
git-daemon: rewrite kindergarden, new option --max-connections
git-daemon: Simplify dead-children reaping logic
git-daemon: use LOG_PID, simplify logging code
git-daemon: call logerror() instead of error()

Trivial merge