From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Sep 2011 20:17:58 +0000 (-0700)
Subject: Merge branch 'ms/daemon-timeout-is-in-seconds'
X-Git-Tag: v1.7.7-rc1~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c33e30675b601d6707dc4022a8f64812509c7566;p=git.git

Merge branch 'ms/daemon-timeout-is-in-seconds'

* ms/daemon-timeout-is-in-seconds:
  git-daemon.txt: specify --timeout in seconds
---

c33e30675b601d6707dc4022a8f64812509c7566